From ed063f1ca9e372efb8259eda523673229f2a26bf Mon Sep 17 00:00:00 2001
From: Philipp Spitzer <philipp@spitzer.priv.at>
Date: Sun, 26 Jun 2011 18:28:57 +0000
Subject: [PATCH] Searching without active conference doesn't give an error
 message anymore (resolves ticket #7).

---
 src/gui/searchtabcontainer.cpp | 2 ++
 src/mvc/conference.h           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/searchtabcontainer.cpp b/src/gui/searchtabcontainer.cpp
index 246b4ea..fa5f22d 100644
--- a/src/gui/searchtabcontainer.cpp
+++ b/src/gui/searchtabcontainer.cpp
@@ -86,6 +86,8 @@ void SearchTabContainer::searchButtonClicked()
     QString keyword = searchHeader->searchEdit->text();
 
     int confId = Conference::activeConference();
+    if (confId == -1) return;
+
     SqlEngine::searchEvent( confId, columns, keyword );
 
     QDate startDate = Conference::getById(confId).start();
diff --git a/src/mvc/conference.h b/src/mvc/conference.h
index 897c396..1d70439 100644
--- a/src/mvc/conference.h
+++ b/src/mvc/conference.h
@@ -35,7 +35,7 @@ public:
 public:
     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);
 
 public:
-- 
2.39.5