Merge pull request #1012 from Aesylwinn/FixPointerDeletion

Fix pointer being deleted twice.
9 years ago · d7845012bf
parent ea06506319 0963adb2f4
commit d7845012bf
2 changed files with 3 additions and 3 deletions
--- a/apps/opencs/view/render/orbitcameramode.cpp
+++ b/apps/opencs/view/render/orbitcameramode.cpp
@ -15,9 +15,9 @@ namespace CSVRender
        , mWorldspaceWidget(worldspaceWidget)
        , mCenterOnSelection(0)
    {
-        mCenterShortcut.reset(new CSMPrefs::Shortcut("orbit-center-selection", worldspaceWidget));
+        mCenterShortcut = new CSMPrefs::Shortcut("orbit-center-selection", worldspaceWidget);
        mCenterShortcut->enable(false);
-        connect(mCenterShortcut.get(), SIGNAL(activated()), this, SLOT(centerSelection()));
+        connect(mCenterShortcut, SIGNAL(activated()), this, SLOT(centerSelection()));
    }

    OrbitCameraMode::~OrbitCameraMode()
--- a/apps/opencs/view/render/orbitcameramode.hpp
+++ b/apps/opencs/view/render/orbitcameramode.hpp
@ -32,7 +32,7 @@ namespace CSVRender

            WorldspaceWidget* mWorldspaceWidget;
            QAction* mCenterOnSelection;
-            std::auto_ptr<CSMPrefs::Shortcut> mCenterShortcut;
+            CSMPrefs::Shortcut* mCenterShortcut;

        private slots: