X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=zouba%2Fsrc%2Flocations.cpp;fp=zouba%2Fsrc%2Flocations.cpp;h=358a2cc844296d993df6981696f741c434076638;hb=5789808b3e0c9a6a1d779270ecfbf0854f4d1b1e;hp=04cf6abb4d9a93993daeeb772e3112031229a0c3;hpb=3556052e58602a9cb56c4ba4325fe92cdad797e7;p=ptas

diff --git a/zouba/src/locations.cpp b/zouba/src/locations.cpp
index 04cf6ab..358a2cc 100644
--- a/zouba/src/locations.cpp
+++ b/zouba/src/locations.cpp
@@ -8,26 +8,24 @@
 #include <QCoreApplication>
 
 QHash<QString,Location *> Locations::locationHash;
-Locations Locations::singleton;
+bool Locations::initialised = false;
 
 Locations::Locations()
 {
-  QCoreApplication::setOrganizationName("ZouBa");
-  QCoreApplication::setOrganizationDomain("zouba.yi.org");
-  QCoreApplication::setOrganizationName("ZouBa");
-
-  restoreLocations();
+    if ( !initialised ) {
+        QCoreApplication::setOrganizationName("ZouBa");
+        QCoreApplication::setOrganizationDomain("zouba.yi.org");
+        QCoreApplication::setOrganizationName("ZouBa");
+
+        restoreLocations();
+        initialised = true;
+    }
 }
 
 Locations::~Locations()
 {
 }
 
-Locations *Locations::instance()
-{
-  return &singleton;
-}
-
 bool Locations::addLocation( Location *location )
 {
   bool succeeded=false;