[Wesnoth-cvs-commits] wesnoth/src sound.cpp

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/07/31 21:25:11

Modified files:
        src            : sound.cpp 

Log message:
        minimal changes to an if

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/sound.cpp.diff?tr1=1.33&tr2=1.34&r1=text&r2=text

Patches:
Index: wesnoth/src/sound.cpp
diff -u wesnoth/src/sound.cpp:1.33 wesnoth/src/sound.cpp:1.34
--- wesnoth/src/sound.cpp:1.33  Sun Jul 31 20:22:08 2005
+++ wesnoth/src/sound.cpp       Sun Jul 31 21:25:11 2005
@@ -1,4 +1,4 @@
-/* $Id: sound.cpp,v 1.33 2005/07/31 20:22:08 j_daniel Exp $ */
+/* $Id: sound.cpp,v 1.34 2005/07/31 21:25:11 j_daniel Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -129,11 +129,11 @@
                return;
        else if(current_music.empty() && file.empty())
                return;
-       if(file.empty()) {
-               file = current_music;
-       }
 
-       current_music = file;
+       if(file.empty())
+               file = current_music;
+       else
+               current_music = file;
 
        if(preferences::music_on() && mix_ok) {
                std::map<std::string,Mix_Music*>::const_iterator itor = 
music_cache.find(file);