changeset 1791:15c92d5aebcd trunk

[svn] - really preserve the old message on othertext info
author nenolod
date Wed, 04 Oct 2006 19:00:09 -0700
parents d3293e214422
children b8f082ddd9f1
files ChangeLog audacious/mainwin.c
diffstat 2 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Oct 04 18:52:37 2006 -0700
+++ b/ChangeLog	Wed Oct 04 19:00:09 2006 -0700
@@ -1,3 +1,11 @@
+2006-10-05 01:52:37 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2537]
+  - another oops in my oops fix, sorry
+  
+  trunk/audacious/mainwin.c |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2006-10-05 01:51:58 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2535]
   - i made an oops
--- a/audacious/mainwin.c	Wed Oct 04 18:52:37 2006 -0700
+++ b/audacious/mainwin.c	Wed Oct 04 19:00:09 2006 -0700
@@ -783,9 +783,11 @@
 void
 mainwin_lock_info_text(const gchar * text)
 {
+    if (mainwin_info_text_locked != TRUE)
+        mainwin_tb_old_text = g_strdup(bmp_active_skin->properties.mainwin_othertext_is_status ?
+  	    mainwin_othertext->tb_text : mainwin_info->tb_text);
+
     mainwin_info_text_locked = TRUE;
-    mainwin_tb_old_text = g_strdup(bmp_active_skin->properties.mainwin_othertext_is_status ?
-	mainwin_othertext->tb_text : mainwin_info->tb_text);
     textbox_set_text(bmp_active_skin->properties.mainwin_othertext_is_status ?
 	mainwin_othertext : mainwin_info, text);
 }