mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-21 04:45:31 +08:00
refs #273, fixes "QObject::disconnect: Unexpected null parameter"
This commit is contained in:
@@ -58,9 +58,7 @@ MainWindow::MainWindow(GuiModes::WindowMode windowMode, QWidget *parent) :
|
|||||||
* Destructor
|
* Destructor
|
||||||
*/
|
*/
|
||||||
MainWindow::~MainWindow()
|
MainWindow::~MainWindow()
|
||||||
{
|
{ }
|
||||||
this->disconnect(this->getIContextSimulator(), &IContextSimulator::connectionChanged, this, &MainWindow::simulatorConnectionChanged);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Graceful shutdown
|
* Graceful shutdown
|
||||||
@@ -88,7 +86,7 @@ void MainWindow::gracefulShutdown()
|
|||||||
// if we have a context, we shut some things down
|
// if we have a context, we shut some things down
|
||||||
if (this->m_contextNetworkAvailable)
|
if (this->m_contextNetworkAvailable)
|
||||||
{
|
{
|
||||||
if (this->getIContextNetwork()->isConnected())
|
if (this->getIContextNetwork() && this->getIContextNetwork()->isConnected())
|
||||||
{
|
{
|
||||||
if (this->m_contextAudioAvailable)
|
if (this->m_contextAudioAvailable)
|
||||||
{
|
{
|
||||||
@@ -99,6 +97,9 @@ void MainWindow::gracefulShutdown()
|
|||||||
this->getIContextNetwork()->disconnect(this); // avoid any status update signals, etc.
|
this->getIContextNetwork()->disconnect(this); // avoid any status update signals, etc.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this->getIContextSimulator())
|
||||||
|
this->disconnect(this->getIContextSimulator(), &IContextSimulator::connectionChanged, this, &MainWindow::simulatorConnectionChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
Reference in New Issue
Block a user