mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-25 06:52:56 +02:00
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
Source: upstream
|
|
https://code.soundsoftware.ac.uk/projects/svapp/repository/revisions/fffb78793ca7
|
|
https://code.soundsoftware.ac.uk/projects/svapp/repository/revisions/f54722b34c3a
|
|
|
|
diff -r f54722b34c3a -r fffb78793ca7 framework/MainWindowBase.cpp
|
|
--- svapp/framework/MainWindowBase.cpp
|
|
+++ svapp/framework/MainWindowBase.cpp
|
|
@@ -277,8 +277,8 @@
|
|
connect(m_viewManager, SIGNAL(viewCentreFrameChanged(View *, sv_frame_t)),
|
|
this, SLOT(viewCentreFrameChanged(View *, sv_frame_t)));
|
|
|
|
- connect(m_viewManager, SIGNAL(viewZoomLevelChanged(View *, int, bool)),
|
|
- this, SLOT(viewZoomLevelChanged(View *, int, bool)));
|
|
+ connect(m_viewManager, SIGNAL(viewZoomLevelChanged(View *, ZoomLevel, bool)),
|
|
+ this, SLOT(viewZoomLevelChanged(View *, ZoomLevel, bool)));
|
|
|
|
connect(Preferences::getInstance(),
|
|
SIGNAL(propertyChanged(PropertyContainer::PropertyName)),
|
|
diff -r 109a1dd59f45 -r f54722b34c3a framework/MainWindowBase.cpp
|
|
--- svapp/framework/MainWindowBase.cpp
|
|
+++ svapp/framework/MainWindowBase.cpp
|
|
@@ -328,14 +328,16 @@
|
|
delete m_viewManager;
|
|
delete m_midiInput;
|
|
|
|
- disconnect(m_oscQueueStarter, 0, 0, 0);
|
|
- m_oscQueueStarter->wait(1000);
|
|
- if (m_oscQueueStarter->isRunning()) {
|
|
- m_oscQueueStarter->terminate();
|
|
+ if (m_oscQueueStarter) {
|
|
+ disconnect(m_oscQueueStarter, 0, 0, 0);
|
|
m_oscQueueStarter->wait(1000);
|
|
+ if (m_oscQueueStarter->isRunning()) {
|
|
+ m_oscQueueStarter->terminate();
|
|
+ m_oscQueueStarter->wait(1000);
|
|
+ }
|
|
+ delete m_oscQueueStarter;
|
|
+ delete m_oscQueue;
|
|
}
|
|
- delete m_oscQueueStarter;
|
|
- delete m_oscQueue;
|
|
|
|
Profiles::getInstance()->dump();
|
|
}
|