Correctly detect Cortex-M3 cpus.

[bertos.git] / wizard / BFolderPage.py

diff --git a/wizard/BFolderPage.py b/wizard/BFolderPage.py
index b0f71db882d63aa72d806aa1a2d5574b31c463c6..3b34f14af6e5bcbf4619d18e6866b8a24c53b4ef 100644 (file)
--- a/wizard/BFolderPage.py
+++ b/wizard/BFolderPage.py
@@ -61,6 +61,7 @@ class BFolderPage(BWizardPage):
         self.setDefaultFolder(self._destination_folder)
         if self.pageContent.projectPath.text() != "None":
             self.setProjectInfo("PROJECT_PATH", unicode(self.pageContent.projectPath.text()))
+            self.setProjectInfo("PROJECT_NAME", os.path.basename(unicode(self.pageContent.projectPath.text())))
             return True
         else:
             return False
@@ -103,7 +104,12 @@ class BFolderPage(BWizardPage):
         """
         Slot called when the project folder is changed manually by the user.
         """
-        self._destination_folder = unicode(QDir.toNativeSeparators(directory))
+        try:
+            directory = unicode(directory).encode("ascii")
+        except UnicodeEncodeError:
+            directory = self._destination_folder
+            self.pageContent.directoryEdit.setText(directory)
+        self._destination_folder = directory
         self.setProjectPath()
 
     def selectDirectory(self):