From bc216741f4d2dbcff924743da3d6f4b6aafb5b2c Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Thu, 23 Feb 2012 19:00:13 -0800
Subject: [PATCH] Mixer: Don't die when not running under NSM.

---
 mixer/src/main.C | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mixer/src/main.C b/mixer/src/main.C
index 1de232e..9c85aa7 100644
--- a/mixer/src/main.C
+++ b/mixer/src/main.C
@@ -91,10 +91,10 @@ static void cb_main ( Fl_Double_Window *o, void *)
 }
 
 void
-check_osc ( void * v )
+check_nsm ( void * v )
 {
     nsm->check();
-    Fl::repeat_timeout( OSC_INTERVAL, check_osc, v );
+    Fl::repeat_timeout( OSC_INTERVAL, check_nsm, v );
 }
 
 static int got_sigterm = 0;
@@ -233,6 +233,9 @@ main ( int argc, char **argv )
             if ( ! nsm->init() )
             {
                 nsm->announce( nsm_url, APP_NAME, ":switch:dirty:", argv[0] );
+
+                // poll so we can keep OSC handlers running in the GUI thread and avoid extra sync
+                Fl::add_timeout( OSC_INTERVAL, check_nsm, NULL );
             }
         }
         else
@@ -249,9 +252,6 @@ main ( int argc, char **argv )
         }
     }
     
-    // poll so we can keep OSC handlers running in the GUI thread and avoid extra sync
-    Fl::add_timeout( OSC_INTERVAL, check_osc, NULL );
-
     Fl::add_check( check_sigterm );
 
     Fl::run();