summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2015-07-24 13:53:14 (GMT)
committeralbert-github <albert.tests@gmail.com>2015-07-24 13:53:14 (GMT)
commitc713984bf6a4c9e8c2ea393b304682ce4a56358f (patch)
tree95d4c5c8d94d56fc07ccc65ff0e53147535203ea
parent45e153f2238d0fa031d147cfe207e52b913845eb (diff)
downloadDoxygen-c713984bf6a4c9e8c2ea393b304682ce4a56358f.zip
Doxygen-c713984bf6a4c9e8c2ea393b304682ce4a56358f.tar.gz
Doxygen-c713984bf6a4c9e8c2ea393b304682ce4a56358f.tar.bz2
Bug 682373 - Math does not work in LaTeX with custom header and footer.
Reset current directory in case of return.
-rw-r--r--src/formula.cpp2
-rw-r--r--src/rtfgen.cpp1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/formula.cpp b/src/formula.cpp
index ad37782..182ddaa 100644
--- a/src/formula.cpp
+++ b/src/formula.cpp
@@ -132,6 +132,7 @@ void FormulaList::generateBitmaps(const char *path)
{
err("Problems running dvips. Check your installation!\n");
portable_sysTimerStop();
+ QDir::setCurrent(oldDir);
return;
}
portable_sysTimerStop();
@@ -192,6 +193,7 @@ void FormulaList::generateBitmaps(const char *path)
{
err("Problem running ghostscript %s %s. Check your installation!\n",portable_ghostScriptCommand(),gsArgs);
portable_sysTimerStop();
+ QDir::setCurrent(oldDir);
return;
}
portable_sysTimerStop();
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index 7baaa3c..e10b638 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -2590,6 +2590,7 @@ bool RTFGenerator::preProcessFileInplace(const char *path,const char *name)
if (!outf.open(IO_WriteOnly))
{
err("Failed to open %s for writing!\n",combinedName.data());
+ QDir::setCurrent(oldDir);
return FALSE;
}
FTextStream outt(&outf);