From 44e17769180d4fd13282fc26cbd41b4882b2c9b3 Mon Sep 17 00:00:00 2001
From: Eddy Bruel <ejpbruel@mozilla.com>
Date: Fri, 1 Jul 2016 15:19:25 +0200
Subject: [PATCH] Bug 1280257 - Reset non-pending breakpoints when tab is
 reloaded with source maps disabled;r=jryans

---
 devtools/server/actors/script.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/devtools/server/actors/script.js b/devtools/server/actors/script.js
index d06e2b025a1a..ba7bd6d9795d 100644
--- a/devtools/server/actors/script.js
+++ b/devtools/server/actors/script.js
@@ -1985,14 +1985,11 @@ const ThreadActor = ActorClassWithSpec(threadSpec, {
         } else {
           promises.push(this.sources.getAllGeneratedLocations(actor.originalLocation)
                                     .then((generatedLocations) => {
-                                      if (generatedLocations.length > 0 &&
+            if (generatedLocations.length > 0 &&
                 generatedLocations[0].generatedSourceActor.actorID === sourceActor.actorID) {
-                                        sourceActor._setBreakpointAtAllGeneratedLocations(
-                actor,
-                generatedLocations
-              );
-                                      }
-                                    }));
+              sourceActor._setBreakpointAtAllGeneratedLocations(actor, generatedLocations);
+            }
+          }));
         }
       }
 
@@ -2015,6 +2012,10 @@ const ThreadActor = ActorClassWithSpec(threadSpec, {
       for (let actor of bpActors) {
         if (actor.isPending) {
           actor.originalLocation.originalSourceActor._setBreakpoint(actor);
+        } else {
+          actor.originalLocation.originalSourceActor._setBreakpointAtGeneratedLocation(
+            actor, GeneratedLocation.fromOriginalLocation(actor.originalLocation)
+          );
         }
       }
     }