From: "Lubomir I. Ivanov" <neolit...@gmail.com>
This patch reverts commit 50421f1f.
Expose subsurface_mkdir() in qthelper.h as main.cpp already
includes it. Once 'default_directory' is obtained call
subsurface_mkdir() on it. subsurface_mkdir() will not throw an
error if the directory exists according to the QDir documentation.
Signed-off-by: Lubomir I. Ivanov <neolit...@gmail.com>
---
new patch with fixed typo.
please test!
only tested on Windows 7.
---
linux.c | 3 ---
macos.c | 2 --
main.cpp | 1 +
qthelper.h | 1 +
4 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/linux.c b/linux.c
index 6133c26..d4131c7 100644
--- a/linux.c
+++ b/linux.c
@@ -3,7 +3,6 @@
#include "dive.h"
#include "display.h"
#include "membuffer.h"
-#include "qthelperfromc.h"
#include <string.h>
#include <sys/types.h>
#include <dirent.h>
@@ -64,8 +63,6 @@ static const char *system_default_path_append(const char
*append)
memset(buffer, 0, len);
strcat(buffer, home);
strcat(buffer, path);
- // make sure this path exists
- subsurface_mkdir(buffer);
if (append) {
strcat(buffer, "/");
strcat(buffer, append);
diff --git a/macos.c b/macos.c
index ece7c83..aa2be4b 100644
--- a/macos.c
+++ b/macos.c
@@ -56,8 +56,6 @@ static const char *system_default_path_append(const char
*append)
memset(buffer, 0, len);
strcat(buffer, home);
strcat(buffer, path);
- // make sure this path exists
- subsurface_mkdir(buffer);
if (append) {
strcat(buffer, "/");
strcat(buffer, append);
diff --git a/main.cpp b/main.cpp
index f27a174..171876a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -36,6 +36,7 @@ int main(int argc, char **argv)
const char *default_directory = system_default_directory();
const char *default_filename = system_default_filename();
+ subsurface_mkdir(default_directory);
for (i = 1; i < arguments.length(); i++) {
QString a = arguments.at(i);
diff --git a/qthelper.h b/qthelper.h
index f5457b1..a2b7b6c 100644
--- a/qthelper.h
+++ b/qthelper.h
@@ -130,5 +130,6 @@ bool parseGpsText(const QString &gps_text, double
*latitude, double *longitude);
QByteArray getCurrentAppState();
void setCurrentAppState(QByteArray state);
extern "C" bool in_planner();
+extern "C" void subsurface_mkdir(const char *dir);
#endif // QTHELPER_H
--
1.7.11.msysgit.0
_______________________________________________
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
