Changeset ed063f1

Timestamp:

06/26/11 20:28:57 (11 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

3686b97

Parents:

f48bf9f

Message:

Searching without active conference doesn't give an error message anymore (resolves ticket #7).

Location:

src

Files:

• gui/searchtabcontainer.cpp (modified) (1 diff)
• mvc/conference.h (modified) (1 diff)

src/gui/searchtabcontainer.cpp

@@ -87 +87 @@
 
     int confId = Conference::activeConference();
+    if (confId == -1) return;
+
     SqlEngine::searchEvent( confId, columns, keyword );
 

src/mvc/conference.h

@@ -36 +36 @@
     static Conference getById(int id);
     static QList<Conference> getAll();
-    static int activeConference();
+    static int activeConference(); ///< returns -1 if no conference is active
     static void deleteConference(int id);