From f0d2584fdad44703f3966eb0b1e695341a4ca01c Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Sat, 7 May 2016 23:58:52 +0800 Subject: Added two new options. Fixed several crashes related to options without a description. Sanitise deinitialize order again. Fixed several memory leaks. --- qmidiplayer-desktop/qmpmainwindow.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'qmidiplayer-desktop/qmpmainwindow.cpp') diff --git a/qmidiplayer-desktop/qmpmainwindow.cpp b/qmidiplayer-desktop/qmpmainwindow.cpp index 3842757..c377010 100644 --- a/qmidiplayer-desktop/qmpmainwindow.cpp +++ b/qmidiplayer-desktop/qmpmainwindow.cpp @@ -62,7 +62,14 @@ qmpMainWindow::qmpMainWindow(QWidget *parent) : qmpMainWindow::~qmpMainWindow() { delete pmgr;if(player)delete player; - if(timer)delete timer;delete ui; + if(timer)delete timer; + delete helpw;helpw=NULL; + delete efxw;efxw=NULL; + delete chnlw;chnlw=NULL; + delete plistw;plistw=NULL; + delete infow;infow=NULL; + delete settingsw;settingsw=NULL; + delete ui; } void qmpMainWindow::init() @@ -183,12 +190,6 @@ void qmpMainWindow::closeEvent(QCloseEvent *event) efxw->close();chnlw->close(); plistw->close();infow->close(); settingsw->close(); - delete helpw;helpw=NULL; - delete efxw;efxw=NULL; - delete chnlw;chnlw=NULL; - delete plistw;plistw=NULL; - delete infow;infow=NULL; - delete settingsw;settingsw=NULL; event->accept(); } -- cgit v1.2.3