AxioDL
/
amuse
mirror of https://github.com/AxioDL/amuse.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crashes while moving tiles

This commit is contained in:
Phillip Stephens 2021-06-20 17:42:38 -07:00
parent 3290b706fc
commit 6e896fa1d3
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
4 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Editor/SoundMacroEditor.cpp
View File

@ -516,6 +516,7 @@ void SoundMacroListing::startAutoscroll(QWidget* source, QMouseEvent* event, int
m_autoscrollSource = source; m_autoscrollSource = source;
if (m_autoscrollEvent) { if (m_autoscrollEvent) {
delete m_autoscrollEvent; delete m_autoscrollEvent;
m_autoscrollEvent = nullptr;
} }
m_autoscrollEvent = event->clone(); m_autoscrollEvent = event->clone();
} }
@ -528,6 +529,7 @@ void SoundMacroListing::stopAutoscroll() {
m_autoscrollDelta = 0; m_autoscrollDelta = 0;
if (m_autoscrollEvent) { if (m_autoscrollEvent) {
delete m_autoscrollEvent; delete m_autoscrollEvent;
m_autoscrollEvent = nullptr;
} }
m_autoscrollSource = nullptr; m_autoscrollSource = nullptr;
} }

2
Editor/StudioSetupWidget.cpp
View File

@ -498,6 +498,7 @@ void EffectListing::startAutoscroll(QWidget* source, QMouseEvent* event, int del
m_autoscrollSource = source; m_autoscrollSource = source;
if (m_autoscrollEvent != nullptr) { if (m_autoscrollEvent != nullptr) {
delete m_autoscrollEvent; delete m_autoscrollEvent;
m_autoscrollEvent = nullptr;
} }
m_autoscrollEvent = event->clone(); m_autoscrollEvent = event->clone();
} }
@ -510,6 +511,7 @@ void EffectListing::stopAutoscroll() {
m_autoscrollDelta = 0; m_autoscrollDelta = 0;
if (m_autoscrollEvent != nullptr) { if (m_autoscrollEvent != nullptr) {
delete m_autoscrollEvent; delete m_autoscrollEvent;
m_autoscrollEvent = nullptr;
} }
m_autoscrollSource = nullptr; m_autoscrollSource = nullptr;
} }

2
Editor/StudioSetupWidget.hpp
View File

@ -46,7 +46,7 @@ signals:
void valueChanged(int chanIdx, int val); void valueChanged(int chanIdx, int val);
private: private:
std::array<FieldSlider*, NumSliders> m_sliders; std::array<FieldSlider*, NumSliders> m_sliders {};
}; };
class Uint32X8Button : public QPushButton { class Uint32X8Button : public QPushButton {

40
Editor/resources/lang_de.ts
View File

@ -1893,72 +1893,72 @@
<context> <context>
<name>SoundMacroCatalogue</name> <name>SoundMacroCatalogue</name>
<message> <message>
<location filename="../SoundMacroEditor.cpp" line="832"/> <location filename="../SoundMacroEditor.cpp" line="834"/>
<source>Control</source> <source>Control</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SoundMacroEditor.cpp" line="832"/> <location filename="../SoundMacroEditor.cpp" line="834"/>
<source>Pitch</source> <source>Pitch</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SoundMacroEditor.cpp" line="833"/> <location filename="../SoundMacroEditor.cpp" line="835"/>
<source>Sample</source> <source>Sample</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SoundMacroEditor.cpp" line="833"/> <location filename="../SoundMacroEditor.cpp" line="835"/>
<source>Setup</source> <source>Setup</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SoundMacroEditor.cpp" line="834"/> <location filename="../SoundMacroEditor.cpp" line="836"/>
<source>Special</source> <source>Special</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SoundMacroEditor.cpp" line="834"/> <location filename="../SoundMacroEditor.cpp" line="836"/>
<source>Structure</source> <source>Structure</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SoundMacroEditor.cpp" line="835"/> <location filename="../SoundMacroEditor.cpp" line="837"/>
<source>Volume</source> <source>Volume</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SoundMacroEditor.cpp" line="838"/> <location filename="../SoundMacroEditor.cpp" line="840"/>
<source>Commands to control the voice</source> <source>Commands to control the voice</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SoundMacroEditor.cpp" line="839"/> <location filename="../SoundMacroEditor.cpp" line="841"/>
<source>Commands to control the voice&apos;s pitch</source> <source>Commands to control the voice&apos;s pitch</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SoundMacroEditor.cpp" line="840"/> <location filename="../SoundMacroEditor.cpp" line="842"/>
<source>Commands to control the voice&apos;s sample playback</source> <source>Commands to control the voice&apos;s sample playback</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SoundMacroEditor.cpp" line="841"/> <location filename="../SoundMacroEditor.cpp" line="843"/>
<source>Commands to setup the voice&apos;s mixing process</source> <source>Commands to setup the voice&apos;s mixing process</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SoundMacroEditor.cpp" line="842"/> <location filename="../SoundMacroEditor.cpp" line="844"/>
<source>Miscellaneous commands</source> <source>Miscellaneous commands</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SoundMacroEditor.cpp" line="843"/> <location filename="../SoundMacroEditor.cpp" line="845"/>
<source>Commands to control macro branching</source> <source>Commands to control macro branching</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SoundMacroEditor.cpp" line="844"/> <location filename="../SoundMacroEditor.cpp" line="846"/>
<source>Commands to control the voice&apos;s volume</source> <source>Commands to control the voice&apos;s volume</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1974,17 +1974,17 @@
<context> <context>
<name>SoundMacroListing</name> <name>SoundMacroListing</name>
<message> <message>
<location filename="../SoundMacroEditor.cpp" line="575"/> <location filename="../SoundMacroEditor.cpp" line="577"/>
<source>Reorder %1</source> <source>Reorder %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SoundMacroEditor.cpp" line="687"/> <location filename="../SoundMacroEditor.cpp" line="689"/>
<source>Insert %1</source> <source>Insert %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SoundMacroEditor.cpp" line="732"/> <location filename="../SoundMacroEditor.cpp" line="734"/>
<source>Delete %1</source> <source>Delete %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2015,17 +2015,17 @@
<context> <context>
<name>StudioSetupWidget</name> <name>StudioSetupWidget</name>
<message> <message>
<location filename="../StudioSetupWidget.cpp" line="933"/> <location filename="../StudioSetupWidget.cpp" line="935"/>
<source>Studio Setup</source> <source>Studio Setup</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../StudioSetupWidget.cpp" line="950"/> <location filename="../StudioSetupWidget.cpp" line="952"/>
<source>Aux A</source> <source>Aux A</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../StudioSetupWidget.cpp" line="951"/> <location filename="../StudioSetupWidget.cpp" line="953"/>
<source>Aux B</source> <source>Aux B</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>