added guard against in-progress $apply

lmirosevic · Oct 3, 2013 · a10c2c6 · a10c2c6
1 parent 93cd0d2
commit a10c2c6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/public/js/stateManager.js b/public/js/stateManager.js
@@ -70,7 +70,7 @@ angular.module("stateManager", [])
 
 					//run initialiser
 					initialiserStack[i](getProperPathComponents());
-					rootScope.$apply();
+					$rootScope.$$phase || $rootScope.$apply();
 				}
 			}