Set stop_at_end in getNext() rather than in main.cpp, as it gets lost.

acaudwell · Jul 6, 2010 · 9e783f3 · 9e783f3
1 parent 892ebed
commit 9e783f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/gource_shell.cpp b/src/gource_shell.cpp
@@ -87,6 +87,10 @@ Gource* GourceShell::getNext() {
 
     gGourceSettings.importGourceSettings(*conf, *gource_settings);
 
+    //recording a video kind of implies you want this
+    if(exporter!=0 && !gGourceSettings.dont_stop && !gGourceSettings.loop)
+        gGourceSettings.stop_at_end = true;
+
     //multiple repo special settings
     if(gGourceSettings.repo_count > 1) {
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -99,8 +99,6 @@ int main(int argc, char *argv[]) {
     FrameExporter* exporter = 0;
 
     if(gGourceSettings.output_ppm_filename.size() > 0) {
-        //recording a video kind of implies you want this
-        if(!gGourceSettings.dont_stop) gGourceSettings.stop_at_end = true;
 
         try {
 
@@ -141,7 +139,7 @@ int main(int argc, char *argv[]) {
     }
 
     if(gourcesh != 0) delete gourcesh;
-    if(exporter != 0)  delete exporter;
+    if(exporter != 0) delete exporter;
 
     //free resources
     display.quit();