#
#
# patch "NEWS"
#  from [39422642985821574eda5c5abaa6d2fbbd91c70b]
#    to [387d5d8889ef69a23a7d0778e2ae8c61b405e534]
# 
# patch "src/GuitoneStandalone.cpp"
#  from [addb469b1259221b64a6644a2512f3cd9e2f8e67]
#    to [96136d4e4938b1b0551565c536e42714b4f82c74]
# 
# patch "src/GuitoneStandalone.h"
#  from [26fea437d47ba46c1928f52ba4ce9e5bd5a359ae]
#    to [e24ee0655b5718a925a1a738c362237275b25e4f]
#
============================================================
--- NEWS	39422642985821574eda5c5abaa6d2fbbd91c70b
+++ NEWS	387d5d8889ef69a23a7d0778e2ae8c61b405e534
@@ -29,6 +29,10 @@
    has no parent i.e. which has just been set up
  - bugfix: fixed a crash which occured if you tried to opened the manifest view
    of some revision for the second time (a memleak triggered an invariant)
+ - bugfix: if a monotone database was opened on Mac OS X f.e. through the
+   Finder and guitone was not yet opened, both, the startup prompt and the
+   database dialog were displayed on app start while the former blocked the
+   usage of the latter
 
 2008-05-25 (0.8)
  - starting from this version (0.8) guitone is distributed under the terms
============================================================
--- src/GuitoneStandalone.cpp	addb469b1259221b64a6644a2512f3cd9e2f8e67
+++ src/GuitoneStandalone.cpp	96136d4e4938b1b0551565c536e42714b4f82c74
@@ -33,7 +33,7 @@ GuitoneStandalone::GuitoneStandalone(int
 #endif
 
 GuitoneStandalone::GuitoneStandalone(int & argc, char** argv)
-  : GuitoneCore(argc, argv), openPrompt(0)
+  : GuitoneCore(argc, argv), openPrompt(0), somethingLoaded(false)
 {
 #ifdef Q_WS_MACX
      // this is kind of backwards, but there is no other way to do it:
@@ -82,8 +82,6 @@ void GuitoneStandalone::loadSomething()
     I(manager()->monotoneBinaryPathSet());
 
     D("checking command line arguments and file open requests");
-
-    bool somethingLoaded = false;
     for (int i=1, j=programArgs.size(); i<j; i++)
     {
         // we're ok if any of these arguments could be loaded
@@ -147,9 +145,11 @@ bool GuitoneStandalone::event(QEvent * e
             }
             else
             {
-                if (tryLoadSomething(file) && openPrompt)
+                if (tryLoadSomething(file))
                 {
-                    openPrompt->hide();
+                    somethingLoaded = true;
+                    if (openPrompt)
+                        openPrompt->hide();
                 }
             }
             eaten = true;
============================================================
--- src/GuitoneStandalone.h	26fea437d47ba46c1928f52ba4ce9e5bd5a359ae
+++ src/GuitoneStandalone.h	e24ee0655b5718a925a1a738c362237275b25e4f
@@ -66,6 +66,7 @@ private:
     OpenPrompt * openPrompt;
     QList<MainWindow *> openWindows;
     QMutex lock;
+    bool somethingLoaded;
 };
 
 #endif