mirror
/
dl-fldigi
kopia lustrzana https://github.com/jamescoxon/dl-fldigi
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Save Macro - Windows 

* Added logic to test for proper expanded pathname on windows - ugh
pull/1/head
David Freese 2012-03-02 15:20:45 -06:00
rodzic 331ff2e7c2
commit 23e315b318
1 zmienionych plików z 13 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
src/misc/macros.cxx
Wyświetl plik

@ -2089,10 +2089,11 @@ void MACROTEXT::openMacroFile()
{
std::string deffilename = MacrosDir;
if (progStatus.LastMacroFile.find("/") == string::npos)
deffilename.append(progStatus.LastMacroFile);
else
if (progStatus.LastMacroFile.find("/") != string::npos ||
progStatus.LastMacroFile.find("\\") != string::npos)
deffilename.assign(progStatus.LastMacroFile);
else
deffilename.append(progStatus.LastMacroFile);
const char *p = FSEL::select(
_("Open macro file"),
@ -2113,10 +2114,12 @@ void MACROTEXT::openMacroFile()
void MACROTEXT::writeMacroFile()
{
std::string deffilename = MacrosDir;
if (progStatus.LastMacroFile.find("/") == string::npos)
deffilename.append(progStatus.LastMacroFile);
else
if (progStatus.LastMacroFile.find("/") != string::npos ||
progStatus.LastMacroFile.find("\\") != string::npos)
deffilename.assign(progStatus.LastMacroFile);
else
deffilename.append(progStatus.LastMacroFile);
saveMacros(deffilename.c_str());
}
@ -2124,10 +2127,11 @@ void MACROTEXT::saveMacroFile()
{
std::string deffilename = MacrosDir;
if (progStatus.LastMacroFile.find("/") == string::npos)
deffilename.append(progStatus.LastMacroFile);
else
if (progStatus.LastMacroFile.find("/") != string::npos ||
progStatus.LastMacroFile.find("\\") != string::npos)
deffilename.assign(progStatus.LastMacroFile);
else
deffilename.append(progStatus.LastMacroFile);
const char *p = FSEL::saveas(
_("Save macro file"),