[tor-commits] [vidalia/alpha] Fix show on startup being ignored by making the StatusTab visible

[chiiph at torproject.org]

commit 45b914d6842ce88f6578cdb65a730d59cfe24268
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Fri Mar 9 15:19:11 2012 -0300

    Fix show on startup being ignored by making the StatusTab visible
---
 src/vidalia/MainWindow.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
index a27b197..4307f05 100644
--- a/src/vidalia/MainWindow.cpp
+++ b/src/vidalia/MainWindow.cpp
@@ -130,7 +130,7 @@ MainWindow::MainWindow()
     TransformProcessType(&psn, kProcessTransformToForegroundApplication);
   }
   /* Vidalia launched in background (LSUIElement=true). Bring to foreground. */
-  VidaliaWindow::setVisible(true);
+  VidaliaWindow::setVisible(settings.showMainWindowAtStart());
 #endif
 }
 
@@ -310,7 +310,7 @@ MainWindow::createTrayIcon()
 
   _statusTab.checkShowOnStartup(settings.showMainWindowAtStart());
   if (_statusTab.isCheckedShowOnStartup())
-    show(); 
+    show();
   _trayIcon.show();
 }
 
@@ -1820,7 +1820,7 @@ MainWindow::addTab(VidaliaTab *tab)
   _tabMap << tab->getTitle();
   connect(tab, SIGNAL(helpRequested(QString)),
           this, SLOT(showHelpDialog(QString)));
-  if(!isVisible())
+  if(!isVisible() and (tab != &_statusTab))
     setVisible(true);
 }