fix: Fix occasional crash during startup

digidem · Jun 10, 2019 · b43f87a · b43f87a
1 parent 562e40a
commit b43f87a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/frontend/sharedComponents/CameraView.js b/src/frontend/sharedComponents/CameraView.js
@@ -35,7 +35,7 @@ type Acceleration = { x: number, y: number, z: number };
 
 class CameraView extends React.Component<Props, State> {
   cameraRef: { current: any };
-  subscription: { remove: () => any };
+  subscription: { remove: () => any } | null;
   acceleration: Acceleration;
   mounted: boolean;
   state = { takingPicture: false, showCamera: true };
@@ -48,7 +48,7 @@ class CameraView extends React.Component<Props, State> {
   componentDidMount() {
     this.mounted = true;
     Accelerometer.isAvailableAsync().then(motionAvailable => {
-      if (!motionAvailable) return;
+      if (!motionAvailable || !this.mounted || this.subscription) return;
       Accelerometer.setUpdateInterval(1000);
       this.subscription = Accelerometer.addListener(acc => {
         this.acceleration = acc;
@@ -59,6 +59,7 @@ class CameraView extends React.Component<Props, State> {
   componentWillUnmount() {
     this.mounted = false;
     if (this.subscription) this.subscription.remove();
+    this.subscription = null;
   }
 
   handleAddPress = (e: any) => {