[chronojump/chronojump-importer] Fixes chronojump-importer filename on Windows.
- From: Carles Pina i Estany <carlespina src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump/chronojump-importer] Fixes chronojump-importer filename on Windows.
- Date: Tue, 27 Sep 2016 12:07:17 +0000 (UTC)
commit 63305869b75251dc91ba391c794ca44740d8215f
Author: Carles Pina i Estany <carles pina cat>
Date: Tue Sep 27 14:06:38 2016 +0200
Fixes chronojump-importer filename on Windows.
Makes sure to write (or try to) the LogB when throwing the exception.
src/chronojump.cs | 2 +-
src/gui/chronojump.cs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/chronojump.cs b/src/chronojump.cs
index 60d9302..05a45cb 100644
--- a/src/chronojump.cs
+++ b/src/chronojump.cs
@@ -88,8 +88,8 @@ public class ChronoJump
System.IO.Path.Combine(baseDirectory, x64) :
System.IO.Path.Combine(baseDirectory, i386);
if (Directory.Exists(rPath) == false) {
- throw new DirectoryNotFoundException(string.Format("Could not found the
specified path to the directory containing R.dll: {0}", rPath));
LogB.Error("Could not found the specified path to the directory containing
R.dll: ", rPath);
+ throw new DirectoryNotFoundException(string.Format("Could not found the
specified path to the directory containing R.dll: {0}", rPath));
}
var newPath = string.Format("{0}{1}{2}", rPath, System.IO.Path.PathSeparator,
envPath);
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index efda199..7586636 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -2411,7 +2411,7 @@ public partial class ChronoJumpWindow
string importer_executable;
if (UtilAll.IsWindows()) {
- importer_executable = System.IO.Path.Combine (Util.GetPrefixDir (),
"bin\\chronojump-importer\\chronojump_importer.py");
+ importer_executable = System.IO.Path.Combine (Util.GetPrefixDir (),
"bin\\chronojump-importer\\chronojump_importer.exe");
} else {
importer_executable = System.IO.Path.Combine (Util.GetPrefixDir (), "bin" +
Path.DirectorySeparatorChar + "chronojump_importer.py");
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]