comparison main/main.cpp @ 283:d27c322b5d6e

* Avoid crash when "hiding" non-visible splash (I don't quite understand
  this one, but hey)

 #include "system/Init.h"
 #include "base/TempDirectory.h"
 #include "base/PropertyContainer.h"
 #include "base/Preferences.h"
 #include "widgets/TipDialog.h"
-#include "rdf/SimpleSPARQLQuery.h"
 
 #include <QMetaType>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QMessageBox>

     QApplication::setOrganizationName("sonic-visualiser");
     QApplication::setOrganizationDomain("sonicvisualiser.org");
     QApplication::setApplicationName(QApplication::tr("Sonic Visualiser"));
 
     QPixmap pixmap(":/icons/sv-splash.png");
-    QSplashScreen splash(pixmap);
+    QSplashScreen *splash = 0;
 
     QSettings settings;
 
     settings.beginGroup("Preferences");
     if (settings.value("show-splash", true).toBool()) {
-        splash.show();
-        QTimer::singleShot(5000, &splash, SLOT(hide()));
+        splash = new QSplashScreen(pixmap);
+        splash->show();
+        QTimer::singleShot(5000, splash, SLOT(hide()));
         application.processEvents();
     }
     settings.endGroup();
 
     settings.beginGroup("RDF");

         QStringList list;
         list << "http://www.vamp-plugins.org/rdf/plugins/index.txt";
         settings.setValue("rdf-indices", list);
     }
     settings.endGroup();
-
-    SimpleSPARQLQuery::setImplementationPreference
-        (SimpleSPARQLQuery::UseDatastore);
-//        (SimpleSPARQLQuery::UseDirectParser);
 
     QIcon icon;
     int sizes[] = { 16, 22, 24, 32, 48, 64, 128 };
     for (int i = 0; i < sizeof(sizes)/sizeof(sizes[0]); ++i) {
         icon.addFile(QString(":icons/sv-%1x%2.png").arg(sizes[i]).arg(sizes[i]));

     qRegisterMetaType<size_t>("size_t");
     qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName");
 
     MainWindow *gui = new MainWindow(audioOutput, oscSupport);
     application.setMainWindow(gui);
-    QObject::connect(gui, SIGNAL(hideSplash()), &splash, SLOT(hide()));
+    if (splash) {
+        QObject::connect(gui, SIGNAL(hideSplash()), splash, SLOT(hide()));
+    }
 
     QDesktopWidget *desktop = QApplication::desktop();
     QRect available = desktop->availableGeometry();
 
     int width = available.width() * 2 / 3;

                     status = gui->open(path, MainWindow::CreateAdditionalModel);
                 }
             }
         }
         if (status == MainWindow::FileOpenFailed) {
-            splash.hide();
+            if (splash) splash->hide();
 	    QMessageBox::critical
                 (gui, QMessageBox::tr("Failed to open file"),
                  QMessageBox::tr("File or URL \"%1\" could not be opened").arg(path));
         } else if (status == MainWindow::FileOpenWrongMode) {
-            splash.hide();
+            if (splash) splash->hide();
             QMessageBox::critical
                 (gui, QMessageBox::tr("Failed to open file"),
                  QMessageBox::tr("<b>Audio required</b><p>Please load at least one audio file before importing annotation data"));
         }
     }

     }
 #endif
     settings.endGroup();
 #endif
 
-    splash.finish(gui);
+    if (splash) splash->finish(gui);
+    delete splash;
 
 /*
     TipDialog tipDialog;
     if (tipDialog.isOK()) {
         tipDialog.exec();