Changeset 9059 for trunk/MagicSoft

Timestamp:

07/31/08 10:41:02 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• merpp.cc (modified) (1 diff)
• mreport/MReportCamera.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/merpp.cc

@@ -220 +220 @@
 
         if (arg2.EndsWith(".txt"))  // set --summary
+        {
+            *fLog << inf << "Summary file option switched on automatically due to file extension." << endl;
             kHeaderRun = 0;
+        }
 
         kUpdate = kTRUE;

trunk/MagicSoft/Mars/mreport/MReportCamera.cc

@@ -505 +505 @@
 
     const Ssiz_t pos = str.First(' ');
+    /*
     if (pos<0)
     {
@@ -510 +511 @@
         return kFALSE;
     }
-
-    fHV->fFileName = str(0, pos);
+    */
+
+    fHV->fFileName = pos<0 ? (TString)"" : str(0, pos);
+    if (pos<0)
+        return kTRUE;
 
     str.Remove(0, pos);