Merge pull request ethereum#203 from winsvega/filesystemView

fix filesystem view on windows
microfins · Feb 8, 2016 · eff94e1 · eff94e1
2 parents 2861ef1 + 99c4083
commit eff94e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/qml/ProjectList.qml b/qml/ProjectList.qml
@@ -441,7 +441,7 @@ ScrollView
 					currentFolder = folder
 					folderPath.text = folder
 					projectModel.currentFolder = folder
-					if (currentFolder.indexOf("/") !== -1)
+					if (currentFolder.indexOf("/") !== -1 && currentFolder.substring(1) !== ":")
 						model.append({ fileName: "..", type: "folder", path: currentFolder })
 					fillView(fileIo.directories(folder), "folder")
 					fillView(fileIo.files(folder), "file")

diff --git a/src/FileIo.cpp b/src/FileIo.cpp
@@ -79,6 +79,11 @@ QString FileIo::pathFromUrl(QString const& _url)
 {
 	QUrl url(_url);
 	QString path(url.path());
+#ifdef WIN32
+	if (_url.midRef(1, 1) == ":")
+	path = _url.mid(0, 2).toUpper() + "\\" + path;
+#endif
+
 	if (url.scheme() == "qrc")
 		path = ":" + path;
 #ifdef WIN32