Add:Core:Check for existence of event system before using it

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3297 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/event.c b/navit/navit/event.c
index daa5de8..611579f 100644 (file)
--- a/navit/navit/event.c
+++ b/navit/navit/event.c
@@ -93,6 +93,12 @@ event_call_callback(struct callback_list *cb)
        event_methods.call_callback(cb);
 }
 
+char *
+event_system(void)
+{
+       return e_system;
+}
+
 int
 event_request_system(const char *system, const char *requestor)
 {

diff --git a/navit/navit/event.h b/navit/navit/event.h
index 3b16646..0b5aeb5 100644 (file)
--- a/navit/navit/event.h
+++ b/navit/navit/event.h
@@ -64,6 +64,7 @@ void event_remove_timeout(struct event_timeout *ev);
 struct event_idle *event_add_idle(int priority, struct callback *cb);
 void event_remove_idle(struct event_idle *ev);
 void event_call_callback(struct callback_list *cb);
+char *event_system(void);
 int event_request_system(const char *system, const char *requestor);
 /* end of prototypes */
 #ifdef __cplusplus

diff --git a/navit/navit/graphics.c b/navit/navit/graphics.c
index b2bf280..6d57d14 100644 (file)
--- a/navit/navit/graphics.c
+++ b/navit/navit/graphics.c
@@ -1966,7 +1966,8 @@ do_draw(struct displaylist *displaylist, int cancel, int flags)
                displaylist->m=NULL;
        }
        profile(1,"process_selection\n");
-       event_remove_idle(displaylist->idle_ev);
+       if (displaylist->idle_ev)
+               event_remove_idle(displaylist->idle_ev);
        displaylist->idle_ev=NULL;
        callback_destroy(displaylist->idle_cb);
        displaylist->idle_cb=NULL;

diff --git a/navit/navit/messages.c b/navit/navit/messages.c
index 1410709..b3d9ddc 100644 (file)
--- a/navit/navit/messages.c
+++ b/navit/navit/messages.c
@@ -144,6 +144,8 @@ struct messagelist
 void
 messagelist_init(struct messagelist *this_)
 {
+       if (!event_system())
+               return;
        this_->msg_cleanup_cb = callback_new_1(callback_cast(message_cleanup), this_);
        this_->msg_cleanup_to = event_add_timeout(1000, 1, this_->msg_cleanup_cb);
 }