[mythtv] PATCH: MythGame makecmd_line not add params not needed to index collection

[DanM]

I ran into a problem where mythgame was putting out bogus command line 
parameters ie -scale 1729837 for xmame when it was indexing my 
collection of roms.  This patch check if game contains >/dev/null, and 
if so, then doesn't append on all the params.  Everything works fine 
when playing a game though.

-dan
-------------- next part --------------
Index: mythgame/mamehandler.cpp
===================================================================
RCS file: /var/lib/cvs/mythgame/mythgame/mamehandler.cpp,v
retrieving revision 1.14
diff -u -d -r1.14 mamehandler.cpp
--- mythgame/mamehandler.cpp	6 Mar 2003 15:34:07 -0000	1.14
+++ mythgame/mamehandler.cpp	29 Mar 2003 00:35:51 -0000
@@ -830,40 +830,44 @@
         }
         /* the nocursor option doesn't apply to SDL builds of xmame */
         if ( strcmp(general_prefs.xmame_display_target, "SDL")) {
-          *exec+= game_settings.fullscreen ? (" -nocursor" + fullscreen) : 
+          *exec+= game_settings.fullscreen ? (" -nocursor" + fullscreen) :
                   windowed;
         }
         else
           *exec+= game_settings.fullscreen ? fullscreen : windowed;
 
-        *exec+= game_settings.scanlines ? " -scanlines" : " -noscanlines";
-        *exec+= game_settings.extra_artwork ? " -artwork" : " -noartwork";
-        *exec+= game_settings.autoframeskip ? " -autoframeskip" : " -noautoframeskip";
-        *exec+= game_settings.auto_colordepth ? " -bpp 0" : " ";
-        *exec+= game_settings.rot_left ? " -rol" : "";
-        *exec+= game_settings.rot_right ? " -ror" : "";
-        *exec+= game_settings.flipx ? " -flipx" : "";
-        *exec+= game_settings.flipy ? " -flipy" : "";
-        *exec+= " -scale ";
-        *exec+= scale;
-        *exec+= game_settings.antialias ? " -antialias" : " -noantialias";
-        *exec+= game_settings.translucency ? " -translucency" : " -notranslucency";
-        *exec+= vectoropts;
-        *exec+= vectorres;
-        *exec+= game_settings.analog_joy ? " -analogstick" : " -noanalogstick";
-        *exec+= game_settings.mouse ? " -mouse" : " -nomouse";
-        *exec+= game_settings.winkeys ? winkeys : nowinkeys;
-        *exec+= game_settings.grab_mouse ? grabmouse : nograbmouse;
-        *exec+= " -joytype ";
-        *exec+= joytype;
-        *exec+= game_settings.sound ? " -sound" : " -nosound";
-        *exec+= game_settings.samples ? " -samples" : " -nosamples";
-        *exec+= game_settings.fake_sound ? " -fakesound" : "";
-        *exec+= " -volume ";
-        *exec+= volume;
-        *exec+=  " ";
-        *exec+= game_settings.cheat ? " -cheat " : " -nocheat ";
-        //*exec+= game_settings.extra_options ? game_settings.extra_options : " ";
+        //If we're not playing a game, then don't throw in the extra stuff which can muck
+	// things up
+        if ( !strstr(game, ">/dev/null") ) {
+                *exec+= game_settings.scanlines ? " -scanlines" : " -noscanlines";
+                *exec+= game_settings.extra_artwork ? " -artwork" : " -noartwork";
+                *exec+= game_settings.autoframeskip ? " -autoframeskip" : " -noautoframeskip";
+                *exec+= game_settings.auto_colordepth ? " -bpp 0" : " ";
+                *exec+= game_settings.rot_left ? " -rol" : "";
+                *exec+= game_settings.rot_right ? " -ror" : "";
+                *exec+= game_settings.flipx ? " -flipx" : "";
+                *exec+= game_settings.flipy ? " -flipy" : "";
+                *exec+= " -scale ";
+                *exec+= scale;
+                *exec+= game_settings.antialias ? " -antialias" : " -noantialias";
+                *exec+= game_settings.translucency ? " -translucency" : " -notranslucency";
+                *exec+= vectoropts;
+                *exec+= vectorres;
+                *exec+= game_settings.analog_joy ? " -analogstick" : " -noanalogstick";
+                *exec+= game_settings.mouse ? " -mouse" : " -nomouse";
+                *exec+= game_settings.winkeys ? winkeys : nowinkeys;
+                *exec+= game_settings.grab_mouse ? grabmouse : nograbmouse;
+                *exec+= " -joytype ";
+                *exec+= joytype;
+                *exec+= game_settings.sound ? " -sound" : " -nosound";
+                *exec+= game_settings.samples ? " -samples" : " -nosamples";
+                *exec+= game_settings.fake_sound ? " -fakesound" : "";
+                *exec+= " -volume ";
+                *exec+= volume;
+                *exec+=  " ";
+                *exec+= game_settings.cheat ? " -cheat " : " -nocheat ";
+                //*exec+= game_settings.extra_options ? game_settings.extra_options : " ";
+	}
         *exec+= " ";
         *exec+= game;
 }