Merge branch '4.2.3'

src/ext/lib/Settings.js

@@ -76,7 +76,9 @@ class Settings {
 
   async init() {
     const settings = await this.get();
-    const oldVersion = settings.version;
+
+    //                 |—> on first setup, settings is undefined & settings.version is haram
+    const oldVersion = (settings && settings.version) || '0.0.0';
     const currentVersion = this.getExtensionVersion();
 
     if(Debug.debug) {

src/ext/lib/ar-detect/ArDetector.js

@@ -1,3 +1,4 @@
+
 import Debug from '../../conf/Debug';
 import EdgeDetect from './edge-detect/EdgeDetect';
 import EdgeStatus from './edge-detect/enums/EdgeStatusEnum';
@@ -206,15 +207,23 @@ class ArDetector {
       this.conf.resizer.setLastAr({type: AspectRatio.Automatic, ratio: this.getDefaultAr()});
     }
 
+
+    
     // launch main() if it's currently not running:
     this.main();
+    // automatic detection starts halted. If halted=false when main first starts, extension won't run
+    // this._paused is undefined the first time we run this function, which is effectively the same thing
+    // as false. Still, we'll explicitly fix this here.
+    this._paused = false;  
     this._halted = false;
     this._paused = false;
   }
 
   unpause() {
-    if(this._paused){ // resume only if we explicitly paused
+    // pause only if we were running before. Don't pause if we aren't running
-      this.start();
+    // (we are running when _halted is neither true nor undefined)
+    if (this._paused && this._halted === false) {
+      this._paused = true;
     }
   }
 
@@ -233,12 +242,14 @@ class ArDetector {
   }
 
   async main() {
-    if (this.paused) {
+    if (this._paused) {
       // unpause if paused
       this._paused = false;
+      return; // main loop still keeps executing. Return is needed to avoid a million instances of autodetection
     }
     if (!this._halted) { 
       // we are already running, don't run twice
+      // this would have handled the 'paused' from before, actually.
       return;
     }
 
@@ -731,12 +742,6 @@ class ArDetector {
       this.guardline.reset();
       this.conf.resizer.setAr({type: AspectRatio.Automatic, ratio: this.getDefaultAr()});
     }
-
-    // }
-    // else{
-    //   console.log("detected text on edges, dooing nothing")
-    // }
-
   }
 
   resetBlackLevel(){