Merge branch 'master' of github.com:openscad/openscad

1 files changed, 6 insertions, 2 deletions

diff --git a/src/mainwin.cc b/src/mainwin.cc
index 4b0df70..dc5b79b 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -588,7 +588,9 @@ void MainWindow::refreshDocument()
 						 this->fileName.toStdString() % file.errorString().toStdString());
 		}
 		else {
-			QString text = QTextStream(&file).readAll();
+			QTextStream reader(&file);
+			reader.setCodec("UTF-8");
+			QString text = reader.readAll();
 			PRINTB("Loaded design '%s'.", this->fileName.toStdString());
 			editor->setPlainText(text);
 		}
@@ -900,7 +902,9 @@ void MainWindow::actionSave()
 			PRINTB("Failed to open file for writing: %s (%s)", this->fileName.toStdString() % file.errorString().toStdString());
 		}
 		else {
-			QTextStream(&file) << this->editor->toPlainText();
+			QTextStream writer(&file);
+			writer.setCodec("UTF-8");
+			writer << this->editor->toPlainText();
 			PRINTB("Saved design '%s'.", this->fileName.toStdString());
 			this->editor->setContentModified(false);
 		}