[tor-commits] [vidalia/master] Backport fix to bug 5351 to stable

[chiiph at torproject.org]

commit be410cd0e2bde2bcdd8687120389e060aa5228b4
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Sat Jun 16 20:02:59 2012 -0300

    Backport fix to bug 5351 to stable
---
 changes/bug5351            |    1 +
 src/vidalia/MainWindow.cpp |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/changes/bug5351 b/changes/bug5351
new file mode 100644
index 0000000..b01def8
--- /dev/null
+++ b/changes/bug5351
@@ -0,0 +1 @@
+  o Do not ignore the Show on Startup checkbox. Fixes bug 5351.
diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
index 85bc62e..a8dce5a 100644
--- a/src/vidalia/MainWindow.cpp
+++ b/src/vidalia/MainWindow.cpp
@@ -233,7 +233,7 @@ MainWindow::MainWindow()
       TransformProcessType(&psn, kProcessTransformToForegroundApplication);
   }
   /* Vidalia launched in background (LSUIElement=true). Bring to foreground. */
-  VidaliaWindow::setVisible(true);
+  VidaliaWindow::setVisible(settings.showMainWindowAtStart());
 #endif
 
   _flashToggle = false;