reapack

commit c18de06cb93bb5a0e0c9f6507beeead8a0c1ebc2
parent ec321a25f2f718b3b79a9b6e0d8e8adf1cde9d62
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Wed,  2 Dec 2015 00:29:44 -0500

fix a segfault when REAPER is launched from the OSX app bundle

Diffstat:
M
src/path.hpp
 | 
7
+------
M
src/reapack.cpp
 | 
6
+++---

2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/path.hpp b/src/path.hpp
@@ -12,14 +12,9 @@ public:
   bool empty() const { return m_parts.empty(); }
   int size() const { return m_parts.size(); }
 
-  std::string dirname() const { return join(true); }
-  const char *cdirname() const { return dirname().c_str(); }
-
   const std::string &basename() const { return m_parts.back(); }
-  const char *cbasename() const { return basename().c_str(); }
-
+  std::string dirname() const { return join(true); }
   std::string join() const { return join(false); }
-  const char *cjoin() const { return join().c_str(); }
 
   bool operator==(const Path &) const;
   bool operator!=(const Path &) const;
diff --git a/src/reapack.cpp b/src/reapack.cpp
@@ -19,7 +19,7 @@ void ReaPack::init(REAPER_PLUGIN_HINSTANCE instance, reaper_plugin_info_t *rec)
 
   m_dbPath = m_resourcePath + "ReaPack";
 
-  RecursiveCreateDirectory(m_dbPath.cjoin(), 0);
+  RecursiveCreateDirectory(m_dbPath.join().c_str(), 0);
 }
 
 void ReaPack::cleanup()
@@ -85,7 +85,7 @@ void ReaPack::synchronize(const Repository &repo)
     file << dl->contents();
     file.close();
 
-    synchronize(Database::load(path.cjoin()));
+    synchronize(Database::load(path.join().c_str()));
   });
 }
 
@@ -122,7 +122,7 @@ void ReaPack::installPackage(Package *pkg)
     }
 
     const Path path = m_resourcePath + pkg->targetLocation();
-    RecursiveCreateDirectory(path.cdirname(), 0);
+    RecursiveCreateDirectory(path.dirname().c_str(), 0);
 
     ofstream file(path.join());
     if(file.bad()) {