diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 51766fbafc..6e5ea5842a 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -238,8 +238,10 @@ Application::~Application() { _sharedVoxelSystem.changeTree(new VoxelTree); - delete Menu::getInstance(); + _audio.shutdown(); + delete Menu::getInstance(); + delete _oculusProgram; delete _settings; delete _networkAccessManager; diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index 0d4b268fcc..d98577eaaf 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -448,7 +448,7 @@ Audio::Audio(Oscilloscope* scope, int16_t initialJitterBufferSamples) : gettimeofday(&_lastReceiveTime, NULL); } -Audio::~Audio() { +void Audio::shutdown() { if (_stream) { outputPortAudioError(Pa_CloseStream(_stream)); outputPortAudioError(Pa_Terminate()); diff --git a/interface/src/Audio.h b/interface/src/Audio.h index bf99fd3f42..8409f5ca84 100644 --- a/interface/src/Audio.h +++ b/interface/src/Audio.h @@ -33,7 +33,8 @@ class Audio : public QObject { public: // initializes audio I/O Audio(Oscilloscope* scope, int16_t initialJitterBufferSamples); - ~Audio(); + + void shutdown(); void reset(); void render(int screenWidth, int screenHeight); diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 65afc605b0..be24a71f7d 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -416,6 +416,8 @@ Menu::Menu() : Menu::~Menu() { bandwidthDetailsClosed(); voxelStatsDetailsClosed(); + + qDebug() << "menu deleted\n"; } void Menu::loadSettings(QSettings* settings) {