打开窗口时，图标变化问题

tinysniper · Mar 24, 2013 · 2ddd422 · 2ddd422
1 parent 70fb193
commit 2ddd422
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 *.swp
 *~
 build/
+.clang_complete
diff --git a/src/chatwidget/chatmsg_processor.cpp b/src/chatwidget/chatmsg_processor.cpp
@@ -284,8 +284,7 @@ void ChatMsgProcessor::removeAction(QAction *act)
 	actions_.removeOne(act);
 	SystemTrayIcon::instance()->removeAction(act);
 
-	delete act;
-	act = NULL;
+	act->deleteLater();
 }
 
 

diff --git a/src/trayicon/systemtray.cpp b/src/trayicon/systemtray.cpp
@@ -60,6 +60,10 @@ void SystemTrayIcon::removeAction(QAction *act)
 		setIcon(QIcon(QQGlobal::resourceDir() + "/webqq.ico"));
         blink_timer_.stop();
     }
+    else
+    {
+        setIcon(actions_.last()->icon());
+    }
 }
 
 void SystemTrayIcon::addSeparator()