|
|
@@ -49,6 +49,7 @@ public:
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
+ editor_->Close();
|
|
|
return true;
|
|
|
}
|
|
|
}
|
|
|
@@ -61,12 +62,8 @@ public:
|
|
|
{
|
|
|
if (ev.ref_id == TBIDC("TBMessageWindow.ok"))
|
|
|
{
|
|
|
- SharedPtr<ResourceEditor> keepalive(editor_);
|
|
|
container_->OnEvent(ev);
|
|
|
editor_->Close();
|
|
|
- VariantMap editorClosedEvent;
|
|
|
- editorClosedEvent[ResourceEditorClosed::P_RESOURCEEDITOR] = editor_;
|
|
|
- editor_->SendEvent(E_RESOURCEEDITORCLOSED, editorClosedEvent);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -79,7 +76,6 @@ public:
|
|
|
if (RequestClose())
|
|
|
{
|
|
|
container_->OnEvent(ev);
|
|
|
- editor_->Close();
|
|
|
return true;
|
|
|
}
|
|
|
}
|
|
|
@@ -169,6 +165,11 @@ void ResourceEditor::Close(bool navigateToAvailableResource)
|
|
|
data["Editor"] = this;
|
|
|
data["NavigateToAvailableResource"] = navigateToAvailableResource;
|
|
|
SendEvent("EditorCloseResource", data);
|
|
|
+
|
|
|
+
|
|
|
+ VariantMap editorClosedEvent;
|
|
|
+ editorClosedEvent[ResourceEditorClosed::P_RESOURCEEDITOR] = this;
|
|
|
+ SendEvent(E_RESOURCEEDITORCLOSED, editorClosedEvent);
|
|
|
}
|
|
|
|
|
|
void ResourceEditor::InvokeShortcut(const String& shortcut)
|