Changeset d50264 for molecuilder/src/UIElements/TextStatusIndicator.cpp

Timestamp:

Feb 26, 2010, 2:01:57 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

db6b872

Parents:

f467c6 (diff), dc5413 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'StructureRefactoring' into MenuRefactoring

Conflicts:

molecuilder/src/UIElements/TextDialog.cpp

File:

• molecuilder/src/UIElements/TextStatusIndicator.cpp (modified) (1 diff)

molecuilder/src/UIElements/TextStatusIndicator.cpp

@@ -27 +27 @@
   Process *proc;
   // we are only observing Processes
-  if(proc=dynamic_cast<Process*>(subject)){
+  if((proc=dynamic_cast<Process*>(subject))){
     // see what kind of progress we have to display
     if(proc->getMaxSteps()>0){