From c59843c60f660827aad3e295de7abfbe721c9df2 Mon Sep 17 00:00:00 2001
From: namdre <jakob.erdmann@dlr.de>
Date: Wed, 28 Nov 2018 10:47:22 +0100
Subject: [PATCH] addendum refs #1957

---
 src/gui/GUIApplicationWindow.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gui/GUIApplicationWindow.cpp b/src/gui/GUIApplicationWindow.cpp
index 0c6935d4e723..c5a6fd2a36c8 100644
--- a/src/gui/GUIApplicationWindow.cpp
+++ b/src/gui/GUIApplicationWindow.cpp
@@ -1392,16 +1392,6 @@ GUIApplicationWindow::handleEvent_SimulationLoaded(GUIEvent* e) {
                         myRunThread->getBreakpoints().assign(settings.getBreakpoints().begin(), settings.getBreakpoints().end());
                         myRunThread->getBreakpointLock().unlock();
                     }
-                    if (!OptionsCont::getOptions().isDefault("breakpoints")) {
-                        std::vector<SUMOTime> breakpoints;
-                        for (const std::string& val : OptionsCont::getOptions().getStringVector("breakpoints")) {
-                            breakpoints.push_back(string2time(val));
-                        }
-                        std::sort(breakpoints.begin(), breakpoints.end());
-                        myRunThread->getBreakpointLock().lock();
-                        myRunThread->getBreakpoints().assign(breakpoints.begin(), breakpoints.end());
-                        myRunThread->getBreakpointLock().unlock();
-                    }
                     myJamSounds = settings.getEventDistribution("jam");
                     myCollisionSounds = settings.getEventDistribution("collision");
                     if (settings.getJamSoundTime() > 0) {
@@ -1411,6 +1401,16 @@ GUIApplicationWindow::handleEvent_SimulationLoaded(GUIEvent* e) {
             } else {
                 openNewView(defaultType);
             }
+            if (!OptionsCont::getOptions().isDefault("breakpoints")) {
+                std::vector<SUMOTime> breakpoints;
+                for (const std::string& val : OptionsCont::getOptions().getStringVector("breakpoints")) {
+                    breakpoints.push_back(string2time(val));
+                }
+                std::sort(breakpoints.begin(), breakpoints.end());
+                myRunThread->getBreakpointLock().lock();
+                myRunThread->getBreakpoints().assign(breakpoints.begin(), breakpoints.end());
+                myRunThread->getBreakpointLock().unlock();
+            }
 
             if (isGaming()) {
                 setTitle("SUMO Interactive Traffic Light");