Fixed ticket #20

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 1e612dac22fc346c9607b560f54f057dbbdc4c74..f4758c1084ee45d91a0207b38151d17c796e680c 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -154,6 +154,11 @@ void MainWindow::eventHasChanged(int aEventId, bool aReloadModel)
 
 void MainWindow::useConference(int id)
 {
+    if (id == -1)  // in case no conference is active
+    {
+        unsetConference();
+        return;
+    }
     try {
         Conference::getById(Conference::activeConference()).update("active",0);
         Conference new_active = Conference::getById(id);
@@ -178,7 +183,7 @@ void MainWindow::useConference(int id)
         // initTabs();
     } catch (OrmException& e) {
         // cannon set an active conference
-        unsetConference();
+        unsetConference();   // TODO: as no active conference is now correctly managed this should be handled as a fatal error
         return;
     }
 
@@ -187,18 +192,21 @@ void MainWindow::useConference(int id)
 void MainWindow::initTabs()
 {
     int confId = Conference::activeConference();
-    Conference active = Conference::getById(confId);
-    QDate startDate = active.start();
-    QDate endDate = active.end();
-
-    // 'dayNavigator' emits signal 'dateChanged' after setting valid START:END dates
-    dayTabContainer->setDates(startDate, endDate);
-    tracksTabContainer->setDates(startDate, endDate);
-    roomsTabContainer->setDates(startDate, endDate);
-    favsTabContainer->setDates(startDate, endDate);
-    searchTabContainer->setDates(startDate, endDate);
-    searchTabContainer->searchAgainClicked();
-    nowTabContainer->updateTreeView(QDate::currentDate());
+    if (confId != -1)   // only init tabs if a conference is active
+    {
+        Conference active = Conference::getById(confId);
+        QDate startDate = active.start();
+        QDate endDate = active.end();
+
+        // 'dayNavigator' emits signal 'dateChanged' after setting valid START:END dates
+        dayTabContainer->setDates(startDate, endDate);
+        tracksTabContainer->setDates(startDate, endDate);
+        roomsTabContainer->setDates(startDate, endDate);
+        favsTabContainer->setDates(startDate, endDate);
+        searchTabContainer->setDates(startDate, endDate);
+        searchTabContainer->searchAgainClicked();
+        nowTabContainer->updateTreeView(QDate::currentDate());
+    }
 }
 
 void MainWindow::clearTabs()

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index a8b32e9f1c3d22f240e613e16e11ebc90c0e77ae..205ecd080138cee58e4b1924b35ded09c81c5628 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -58,8 +58,10 @@ QString SqlEngine::login(const QString &aDatabaseType, const QString &aDatabaseN
         file.open(QIODevice::ReadOnly | QIODevice::Text);
         QString allSqlStatements = file.readAll();
         foreach(QString sql, allSqlStatements.split(";")) {
+            if (sql.trimmed().length() == 0)     // do not execute empty queries like the last character from create_tables.sql
+                continue;
             QSqlQuery query(database);
-            if (!query.exec(sql)) qDebug() << "Could not execute query" << query.lastError();
+            if (!query.exec(sql)) qDebug() << "Could not execute query '" << sql << "' error:" << query.lastError();
         }
     }
     else