From fa14ca7f75dd9d2ebf4c1a43cb89347fb8370591 Mon Sep 17 00:00:00 2001
From: avolkov <avolkov@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Wed, 26 Oct 2005 07:20:33 +0000
Subject: [PATCH] Ensure that scaler cmdline options override the saved config

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1928 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/starcon2.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sc2/src/starcon2.c b/sc2/src/starcon2.c
index d842288cc..2c3e247b3 100644
--- a/sc2/src/starcon2.c
+++ b/sc2/src/starcon2.c
@@ -459,6 +459,8 @@ parseOptions(int argc, char *argv[], struct options_struct *options)
 				options->gfxDriver = TFB_GFXDRIVER_SDL_OPENGL;
 				break;
 			case 'c':
+				// make sure whatever was set by saved config is cleared
+				options->gfxFlags &= ~TFB_GFXFLAGS_SCALE_ANY;
 				if (!strcmp (optarg, "bilinear"))
 					options->gfxFlags |= TFB_GFXFLAGS_SCALE_BILINEAR;
 				else if (!strcmp (optarg, "biadapt"))