summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2010-05-28 10:19:04 -0700
committerMark Spruiell <mes@zeroc.com>2010-05-28 10:19:04 -0700
commitca854d21719509927ef26d3fc080957ec1a03bd0 (patch)
treee18830aaf5dfe0b505071d7e6aad706e172b51f5
parentbug 4760 - Glacier2 helper classes should cache the client category (diff)
parentPartial properties fix (diff)
downloadice-ca854d21719509927ef26d3fc080957ec1a03bd0.tar.bz2
ice-ca854d21719509927ef26d3fc080957ec1a03bd0.tar.xz
ice-ca854d21719509927ef26d3fc080957ec1a03bd0.zip
Merge branch 'master' of ssh://git.zeroc.com/home/git/ice
-rwxr-xr-x[-rw-r--r--]vsplugin/src/Util.cs11
1 files changed, 7 insertions, 4 deletions
diff --git a/vsplugin/src/Util.cs b/vsplugin/src/Util.cs
index 0c641f2441f..542a9f5bdd4 100644..100755
--- a/vsplugin/src/Util.cs
+++ b/vsplugin/src/Util.cs
@@ -1211,16 +1211,19 @@ namespace Ice.VisualStudio
{
if(project == null || String.IsNullOrEmpty(name))
{
- return ;
+ return;
}
if(project.Globals == null)
{
return;
}
-
- project.Globals[name] = value;
- project.Globals.set_VariablePersists(name, true);
+
+ project.Globals[name] = value;
+ if(!project.Globals.get_VariableExists(name))
+ {
+ project.Globals.set_VariablePersists(name, true);
+ }
}
public static String getPrecompileHeader(Project project)