summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2007-01-29 14:14:53 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2007-01-29 14:14:53 +0000
commita7bffd533c41d2ed33d593281edb6e78e4db27cc (patch)
treedc79177beb9d06b90a5705b4b875f14b68deaae2
parent60a4abd7accfa6f3adc95fe32156ac6f5ec37ae9 (diff)
INTEGRATION: CWS hro11_SRC680 (1.25.26); FILE MERGED
2007/01/25 17:46:22 hro 1.25.26.1: #i73601# Fixed contact flag
-rwxr-xr-xcrashrep/source/unx/main.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
index 95cd317e1988..0bacb7f0737d 100755
--- a/crashrep/source/unx/main.cxx
+++ b/crashrep/source/unx/main.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: main.cxx,v $
*
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
*
- * last change: $Author: ihi $ $Date: 2006-08-29 13:32:09 $
+ * last change: $Author: rt $ $Date: 2007-01-29 15:14:53 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -966,9 +966,10 @@ static void read_settings_from_environment( hash_map< string, string >& rSetting
if ( strEnv.length() )
{
rSettings[ "EMAIL" ] = strEnv;
- rSettings[ "CONTACT" ] = "true";
+ if ( !(rSettings.find( "CONTACT" )->second).length() )
+ rSettings[ "CONTACT" ] = "true";
}
- else
+ else if ( !(rSettings.find( "CONTACT" )->second).length() )
rSettings[ "CONTACT" ] = "false";