From: dooglus <dooglus@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Thu, 17 Jan 2008 17:56:54 +0000 (+0000)
Subject: Fix 1695735: don't treat the required values of command line flags as flags themselves.
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=13bef810fb740e2b4ec4d0f71069c65dc85ca527;p=synfig.git

Fix 1695735: don't treat the required values of command line flags as flags themselves.


git-svn-id: http://svn.voria.com/code@1397 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-core/trunk/src/tool/main.cpp b/synfig-core/trunk/src/tool/main.cpp
index 7e5b189..22f5a98 100644
--- a/synfig-core/trunk/src/tool/main.cpp
+++ b/synfig-core/trunk/src/tool/main.cpp
@@ -667,6 +667,8 @@ int extract_RendDesc(arg_list_t &arg_list,RendDesc &desc)
 			//desc.set_gamma(Gamma(atof(iter->c_str())));
 			arg_list.erase(iter);
 		}
+		else if (flag_requires_value(*iter))
+			iter=next++;
 	}
 	if(w&&h)
 	{
@@ -704,6 +706,8 @@ int extract_quality(arg_list_t &arg_list,int &quality)
 			VERBOSE_OUT(1)<<strprintf(_("Quality set to %d"),quality)<<endl;
 			arg_list.erase(iter);
 		}
+		else if (flag_requires_value(*iter))
+			iter=next++;
 	}
 
 	return SYNFIGTOOL_OK;
@@ -722,6 +726,8 @@ int extract_threads(arg_list_t &arg_list,int &threads)
 			VERBOSE_OUT(1)<<strprintf(_("Threads set to %d"),threads)<<endl;
 			arg_list.erase(iter);
 		}
+		else if (flag_requires_value(*iter))
+			iter=next++;
 	}
 
 	return SYNFIGTOOL_OK;
@@ -741,6 +747,8 @@ int extract_target(arg_list_t &arg_list,string &type)
 			type=*iter;
 			arg_list.erase(iter);
 		}
+		else if (flag_requires_value(*iter))
+			iter=next++;
 	}
 
 	return SYNFIGTOOL_OK;
@@ -760,6 +768,8 @@ int extract_append(arg_list_t &arg_list,string &filename)
 			filename=*iter;
 			arg_list.erase(iter);
 		}
+		else if (flag_requires_value(*iter))
+			iter=next++;
 	}
 
 	return SYNFIGTOOL_OK;
@@ -781,6 +791,8 @@ int extract_outfile(arg_list_t &arg_list,string &outfile)
 			arg_list.erase(iter);
 			ret=SYNFIGTOOL_OK;
 		}
+		else if (flag_requires_value(*iter))
+			iter=next++;
 	}
 
 	return ret;
@@ -800,6 +812,8 @@ int extract_canvasid(arg_list_t &arg_list,string &canvasid)
 			canvasid=*iter;
 			arg_list.erase(iter);
 		}
+		else if (flag_requires_value(*iter))
+			iter=next++;
 	}
 
 	return SYNFIGTOOL_OK;