FarGroupgh-783: Crash when opening a plugin via an association from a…

… plugin panel
MKadaner · Jan 27, 2024 · 31d27e3 · 31d27e3
1 parent fba6686
commit 31d27e3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 2024-01-27 16:45:12+00:00 - build 6261
+
+1. gh-783: Crash when opening a plugin via an association from a plugin panel.
+
 --------------------------------------------------------------------------------
 drkns 2024-01-24 15:47:05+00:00 - build 6260
 

diff --git a/far/filelist.cpp b/far/filelist.cpp
@@ -2716,7 +2716,24 @@ void FileList::ProcessEnter(bool EnableExec,bool SeparateWindow,bool EnableAssoc
 		bool OpenedPlugin = false;
 		const auto PluginMode = m_PanelMode == panel_mode::PLUGIN_PANEL && !PluginManager::UseInternalCommand(GetPluginHandle(), PLUGIN_FARGETFILE, m_CachedOpenPanelInfo);
 		string FileNameToDelete;
-		SCOPE_EXIT{ if (PluginMode && !OpenedPlugin && !FileNameToDelete.empty()) GetPluginHandle()->delayed_delete(FileNameToDelete); };
+
+		SCOPE_EXIT
+		{
+			if (PluginMode && !OpenedPlugin && !FileNameToDelete.empty())
+			{
+				if (const auto PluginHandle = GetPluginHandle())
+				{
+					PluginHandle->delayed_delete(FileNameToDelete);
+				}
+				else
+				{
+					// gh-783: in some cases the panel could be gone before we get here
+					delayed_deleter Deleter(true);
+					Deleter.add(FileNameToDelete);
+				}
+			}
+		};
+
 		file_state SavedState;
 
 		string strTempDir;

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-6260
+6261