1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 14:36:39 +00:00

Merge pull request #1012 from Aesylwinn/FixPointerDeletion

Fix pointer being deleted twice.
This commit is contained in:
scrawl 2016-08-08 23:26:34 +02:00 committed by GitHub
commit d7845012bf
2 changed files with 3 additions and 3 deletions

View file

@ -15,9 +15,9 @@ namespace CSVRender
, mWorldspaceWidget(worldspaceWidget) , mWorldspaceWidget(worldspaceWidget)
, mCenterOnSelection(0) , mCenterOnSelection(0)
{ {
mCenterShortcut.reset(new CSMPrefs::Shortcut("orbit-center-selection", worldspaceWidget)); mCenterShortcut = new CSMPrefs::Shortcut("orbit-center-selection", worldspaceWidget);
mCenterShortcut->enable(false); mCenterShortcut->enable(false);
connect(mCenterShortcut.get(), SIGNAL(activated()), this, SLOT(centerSelection())); connect(mCenterShortcut, SIGNAL(activated()), this, SLOT(centerSelection()));
} }
OrbitCameraMode::~OrbitCameraMode() OrbitCameraMode::~OrbitCameraMode()

View file

@ -32,7 +32,7 @@ namespace CSVRender
WorldspaceWidget* mWorldspaceWidget; WorldspaceWidget* mWorldspaceWidget;
QAction* mCenterOnSelection; QAction* mCenterOnSelection;
std::auto_ptr<CSMPrefs::Shortcut> mCenterShortcut; CSMPrefs::Shortcut* mCenterShortcut;
private slots: private slots: