tmp files fix

FarGroup · Jul 3, 2016 · 3e93540 · 3e93540
1 parent 0ff786e
commit 3e93540
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,7 @@
+drkns 03.07.2016 21:15:27 +0200 - build 4736
+
+1. Временные файлы могли удаляться раньше времени.
+
 drkns 03.07.2016 19:11:29 +0200 - build 4735
 
 1. При определенных условиях мог падать поиск во вьювере.

diff --git a/far/filelist.cpp b/far/filelist.cpp
@@ -2624,8 +2624,9 @@ void FileList::ProcessEnter(bool EnableExec,bool SeparateWindow,bool EnableAssoc
 	}
 	else
 	{
+		PluginHandle* OpenedPlugin = nullptr;
 		const auto PluginMode = m_PanelMode == panel_mode::PLUGIN_PANEL && !Global->CtrlObject->Plugins->UseFarCommand(m_hPlugin, PLUGIN_FARGETFILE);
-		SCOPE_EXIT{ if (PluginMode) DeleteFileWithFolder(strFileName); };
+		SCOPE_EXIT{ if (PluginMode && !OpenedPlugin) DeleteFileWithFolder(strFileName); };
 
 		if (PluginMode)
 		{
@@ -2656,7 +2657,7 @@ void FileList::ProcessEnter(bool EnableExec,bool SeparateWindow,bool EnableAssoc
 
 			const auto IsItExecutable = IsExecutable(strFileName);
 
-			if (!IsItExecutable && !SeparateWindow && OpenFilePlugin(&strFileName, TRUE, Type))
+			if (!IsItExecutable && !SeparateWindow && (OpenedPlugin = OpenFilePlugin(&strFileName, TRUE, Type)) != nullptr)
 				return;
 
 			if (IsItExecutable || SeparateWindow || Global->Opt->UseRegisteredTypes)

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4735)m4_dnl
+m4_define(BUILD,4736)m4_dnl