From b5f381dcbe8d9afdae98db217a08eb7c71eea4dd Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Sat, 12 Dec 2009 15:33:14 +0000
Subject: discriminate between minimization (closing to taskbar) and closing to
 tray

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3688 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/trayicon/libkvitrayicon.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index fde73d2e7..dc16e0978 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -345,11 +345,11 @@ void KviTrayIcon::fillContextPopup()
 
 void KviTrayIcon::toggleParentFrame()
 {
-	if(!m_pFrm->isVisible() || m_pFrm->isMinimized())
+	if(!m_pFrm->isVisible())
 	{
 		//restore mainwindow
-		m_pFrm->setWindowState(m_pFrm->windowState() & (~Qt::WindowMinimized | Qt::WindowActive));
 		m_pFrm->show();
+		m_pFrm->activateWindow();
 	} else {
 		m_pFrm->hide();
 	}
-- 
cgit v1.3.1-10-gc9f91