Browse Source

Prevent possible idle while engine is closing

tags/1.9.4
falkTX 11 years ago
parent
commit
b12c598776
1 changed files with 12 additions and 16 deletions
  1. +12
    -16
      source/carla_host.py

+ 12
- 16
source/carla_host.py View File

@@ -718,6 +718,15 @@ class HostWindow(QMainWindow):
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Internal stuff (gui) # Internal stuff (gui)


def killTimers(self):
if self.fIdleTimerFast != 0:
self.killTimer(self.fIdleTimerFast)
self.fIdleTimerFast = 0

if self.fIdleTimerSlow != 0:
self.killTimer(self.fIdleTimerSlow)
self.fIdleTimerSlow = 0

def setProperWindowTitle(self): def setProperWindowTitle(self):
title = self.fClientName title = self.fClientName


@@ -1024,14 +1033,7 @@ class HostWindow(QMainWindow):


@pyqtSlot() @pyqtSlot()
def slot_handleEngineStoppedCallback(self): def slot_handleEngineStoppedCallback(self):
if self.fIdleTimerFast != 0:
self.killTimer(self.fIdleTimerFast)
self.fIdleTimerFast = 0

if self.fIdleTimerSlow != 0:
self.killTimer(self.fIdleTimerSlow)
self.fIdleTimerSlow = 0

self.killTimers()
self.slot_engineStop(False) self.slot_engineStop(False)


Carla.bufferSize = 0 Carla.bufferSize = 0
@@ -1103,14 +1105,7 @@ class HostWindow(QMainWindow):
QMainWindow.timerEvent(self, event) QMainWindow.timerEvent(self, event)


def closeEvent(self, event): def closeEvent(self, event):
if self.fIdleTimerFast != 0:
self.killTimer(self.fIdleTimerFast)
self.fIdleTimerFast = 0

if self.fIdleTimerSlow != 0:
self.killTimer(self.fIdleTimerSlow)
self.fIdleTimerSlow = 0

self.killTimers()
self.saveSettings() self.saveSettings()


if Carla.host.is_engine_running(): if Carla.host.is_engine_running():
@@ -1214,6 +1209,7 @@ def engineCallback(ptr, action, pluginId, value1, value2, value3, valueStr):
elif action == ENGINE_CALLBACK_ENGINE_STARTED: elif action == ENGINE_CALLBACK_ENGINE_STARTED:
Carla.gui.EngineStartedCallback.emit(value1, value2, valueStr) Carla.gui.EngineStartedCallback.emit(value1, value2, valueStr)
elif action == ENGINE_CALLBACK_ENGINE_STOPPED: elif action == ENGINE_CALLBACK_ENGINE_STOPPED:
Carla.gui.killTimers()
Carla.gui.EngineStoppedCallback.emit() Carla.gui.EngineStoppedCallback.emit()
elif action == ENGINE_CALLBACK_INFO: elif action == ENGINE_CALLBACK_INFO:
Carla.gui.InfoCallback.emit(valueStr) Carla.gui.InfoCallback.emit(valueStr)


Loading…
Cancel
Save