Fixed race condition

mireq · Feb 7, 2015 · b64a7b2 · b64a7b2
1 parent a46bc65
commit b64a7b2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/qml/Btn.qml b/qml/Btn.qml
@@ -50,6 +50,10 @@ Button {
 		interval: 40
 
 		onTriggered: {
+			if (buttonPreview !== null) {
+				buttonPreview.destroy();
+				buttonPreview = null;
+			}
 			buttonPreview = buttonPreviewComponent.createObject(keyboardOverlay, {"btn": btn, "content": typeof(content) == "undefined" ? undefined: content, "keyboard": keyboard});
 		}
 	}
@@ -60,11 +64,11 @@ Button {
 			createPreviewTimer.restart();
 		}
 		else {
+			createPreviewTimer.stop();
 			if (buttonPreview !== null) {
 				buttonPreview.destroy();
 				buttonPreview = null;
 			}
-			createPreviewTimer.stop();
 		}
 	}
 }