Merge pull request #983 from LibrePCB/fix-open-add-component-dialog

Schematic editor: Fix opening component chooser dialog (cherry picked from commit 07e1f09)
LibrePCB · Sep 23, 2022 · acf89fc · acf89fc
1 parent 9fb8a09
commit acf89fc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/libs/librepcb/editor/project/schematiceditor/fsm/schematiceditorstate_addcomponent.cpp b/libs/librepcb/editor/project/schematiceditor/fsm/schematiceditorstate_addcomponent.cpp
@@ -57,6 +57,7 @@ SchematicEditorState_AddComponent::SchematicEditorState_AddComponent(
     const Context& context) noexcept
   : SchematicEditorState(context),
     mIsUndoCmdActive(false),
+    mUseAddComponentDialog(true),
     mAddComponentDialog(nullptr),
     mLastAngle(0),
     mCurrentComponent(nullptr),
@@ -156,6 +157,7 @@ bool SchematicEditorState_AddComponent::processAddComponent() noexcept {
     // start adding (another) component
     if (!abortCommand(true)) return false;
     mLastAngle.setAngleMicroDeg(0);  // reset the angle
+    mUseAddComponentDialog = true;
     startAddingComponent();
     return true;
   } catch (UserCanceled& exc) {
@@ -172,6 +174,7 @@ bool SchematicEditorState_AddComponent::processAddComponent(
     // start adding (another) component
     if (!abortCommand(true)) return false;
     mLastAngle.setAngleMicroDeg(0);  // reset the angle
+    mUseAddComponentDialog = false;
     startAddingComponent(cmp, symbVar);
     return true;
   } catch (UserCanceled& exc) {
@@ -199,7 +202,8 @@ bool SchematicEditorState_AddComponent::processAbortCommand() noexcept {
     if (!abortCommand(true)) {
       return false;
     }
-    if (mAddComponentDialog && mAddComponentDialog->getAutoOpenAgain()) {
+    if (mUseAddComponentDialog && mAddComponentDialog &&
+        mAddComponentDialog->getAutoOpenAgain()) {
       mLastAngle.setAngleMicroDeg(0);  // reset the angle
       startAddingComponent();
       return true;

diff --git a/libs/librepcb/editor/project/schematiceditor/fsm/schematiceditorstate_addcomponent.h b/libs/librepcb/editor/project/schematiceditor/fsm/schematiceditorstate_addcomponent.h
@@ -108,6 +108,7 @@ class SchematicEditorState_AddComponent final : public SchematicEditorState {
 
 private:  // Data
   bool mIsUndoCmdActive;
+  bool mUseAddComponentDialog;
   QScopedPointer<AddComponentDialog> mAddComponentDialog;
   Angle mLastAngle;