# HG changeset patch
# User darius
# Date 966016007 0
# Node ID 32f624fc18ccc46d5af6db6a09ebd576fc32152b
# Parent  4343bc7f829a4478ad9a9f96c14b7cd9dd0fe43c
Resolve merge conflicts..

Make sure we aren't doing anything else when we process RT events.

diff -r 4343bc7f829a -r 32f624fc18cc mservtk.tcl
--- a/mservtk.tcl	Fri May 05 08:55:29 2000 +0000
+++ b/mservtk.tcl	Fri Aug 11 17:46:47 2000 +0000
@@ -44,6 +44,8 @@
     set state(tmpphrase) "";
     set state(sortmode) "Title";
 
+    set state(rtlist) "";
+
     wm withdraw .;
 
     f_readconf;
@@ -73,7 +75,17 @@
     update_timer;
 
     while {1} {
-	vwait state(exit);
+	vwait state;
+
+	if {$state(rtlist) != ""} {
+	    # Copy it so we don't stomp any new additions
+	    set tmp $state(rtlist);
+	    set state(rtlist) "";
+
+	    foreach t $state(rtlist) {
+		n_rthandler [lindex $t 0] [lindex $t 1];
+	    }
+	}
 
 	if {$state(exit) == 1} {
 	    exit;
@@ -810,7 +822,7 @@
 proc n_rthandler {code data} {
     global songs;
 
-    log "%s" "Got RT - $code $data";
+#    log "%s" "Got RT - $code $data";
 
     switch -- $code {
 	600 {
@@ -852,7 +864,8 @@
     }
 
     if {$rth != ""} {
-	n_rthandler [lindex $rth 0] [lindex $rth 1];
+#	n_rthandler [lindex $rth 0] [lindex $rth 1];
+	lappend state(rtlist) $rth;
     }
 }