retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bug leading to application exit when the last window is closed. Don't exit if there is a system tray icon used to access it. 

git-svn-id: http://voip.null.ro/svn/yate@2566 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2009-04-07 14:07:57 +00:00
parent 643249fcd5
commit d2e47713dc
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
clients/qt4/qt4client.cpp
View File

@ -35,6 +35,8 @@
namespace TelEngine {
static int s_allHiddenQuit = 1; // Quit on all hidden notification
// Macro used to get a QT object's name
// Can't use an inline function: the QByteArray object returned by toUtf8()
// would be destroyed on exit
@ -858,8 +860,11 @@ bool QtWindow::setParams(const NamedList& params)
QSystemTrayIcon* trayIcon = findSysTrayIcon(this,ns->name());
// Delete
if (ns->null()) {
if (trayIcon)
if (trayIcon) {
delete trayIcon;
// Reactivate program termination when the last window was hidden
s_allHiddenQuit++;
}
continue;
}
// Create a new one
@ -869,8 +874,11 @@ bool QtWindow::setParams(const NamedList& params)
continue;
trayIcon = new QSystemTrayIcon(this);
trayIcon->setObjectName(QtClient::setUtf8(ns->name()));
QtClient::connectObjects(trayIcon,SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
this,SLOT(sysTrayIconAction(QSystemTrayIcon::ActivationReason)));
if (QtClient::connectObjects(trayIcon,SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
this,SLOT(sysTrayIconAction(QSystemTrayIcon::ActivationReason)))) {
// Deactivate program termination when the last window was hidden
s_allHiddenQuit--;
}
}
// Add dynamic properties on creation
// See
@ -2333,6 +2341,7 @@ void QtClient::run()
int argc = 0;
char* argv = 0;
m_app = new QApplication(argc,&argv);
m_app->setQuitOnLastWindowClosed(false);
Debug(ClientDriver::self(),DebugInfo,"QT client start running (version=%s)",qVersion());
if (!QSound::isAvailable())
Debug(ClientDriver::self(),DebugWarn,"QT sounds are not available");
@ -2355,7 +2364,9 @@ void QtClient::unlock()
void QtClient::allHidden()
{
Debug(QtDriver::self(),DebugInfo,"QtClient::allHiden()");
Debug(QtDriver::self(),DebugInfo,"QtClient::allHiden() counter=%d",s_allHiddenQuit);
if (!s_allHiddenQuit)
return;
quit();
}