tmppanel: tweak open/execute logic in ShowMenuFromList()

elfmz · Dec 2, 2024 · f78bdca · f78bdca
1 parent 2c03f3a
commit f78bdca
Showing 1 changed file with 45 additions and 18 deletions.
diff --git a/tmppanel/src/TmpPanel.cpp b/tmppanel/src/TmpPanel.cpp
@@ -341,29 +341,56 @@ void ReadFileLines(int fd, DWORD FileSizeLow, TCHAR **argv, TCHAR *args, UINT *n
 				ExpandEnvStrs(p, TMP);
 				p = TMP;
 
-				int bShellExecute = BreakCode != -1;
-
-				if (!bShellExecute) {
-					FAR_FIND_DATA FindData = {};
-					if (TmpPanel::GetFileInfoAndValidate(p, &FindData, FALSE)) {
-						if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-							Info.Control(INVALID_HANDLE_VALUE, FCTL_SETPANELDIR, 0, (LONG_PTR)p);
-						} else {
-							bShellExecute = TRUE;
-						}
+				bool bShellExecute = BreakCode != -1;
+
+				enum { ACTION_NOP, ACTION_SETPANELDIR, ACTION_SETCMDLINE, ACTION_OPEN,
+					   ACTION_EXECUTE} Action = ACTION_NOP;
+
+				FAR_FIND_DATA FindData = {};
+
+				if (TmpPanel::GetFileInfoAndValidate(p, &FindData, FALSE)) {
+					if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+						Action = bShellExecute ? ACTION_OPEN : ACTION_SETPANELDIR;
+					} else if (FindData.dwFileAttributes & FILE_ATTRIBUTE_EXECUTABLE) {
+						Action = ACTION_EXECUTE;
 					} else {
+						Action = ACTION_OPEN;
+					}
+				} else {
+					Action = bShellExecute ? ACTION_OPEN : ACTION_SETCMDLINE;
+				}
+
+				if (FindData.lpwszFileName) {
+					free((void *)FindData.lpwszFileName);
+				}
+
+				switch (Action) {
+					case ACTION_SETPANELDIR: {
+						Info.Control(INVALID_HANDLE_VALUE, FCTL_SETPANELDIR, 0, (LONG_PTR)p);
+						break;
+					}
+
+					case ACTION_SETCMDLINE: {
 						Info.Control(PANEL_ACTIVE, FCTL_SETCMDLINE, 0, (LONG_PTR)p);
+						break;
 					}
-					if (FindData.lpwszFileName) {
-						free((void *)FindData.lpwszFileName);
+
+					case ACTION_OPEN: {
+						std::wstring cmd = p;
+						QuoteCmdArgIfNeed(cmd);
+						FSF.Execute(cmd.c_str(), EF_OPEN | EF_NOCMDPRINT | EF_NOWAIT);
+						break;
+					}
+
+					case ACTION_EXECUTE: {
+						std::wstring cmd = p;
+						QuoteCmdArgIfNeed(cmd);
+						FSF.Execute(cmd.c_str(), bShellExecute ? EF_NOWAIT : 0);
+						break;
 					}
-				}
 
-				if (bShellExecute) {
-					DWORD flags = EF_OPEN | EF_NOCMDPRINT | EF_NOWAIT;
-					std::wstring cmd = p;
-					QuoteCmdArgIfNeed(cmd);
-					FSF.Execute(cmd.c_str(), flags);
+					default:
+						;
 				}
 			}
 		}