kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: [skip ci] fix regression in Application::open() and always encode file name when passing it to Python interpreter

Browse Source
This commit is contained in:
wmayer
2020-04-02 11:55:45 +02:00
parent 9332bd9ac7
commit 5e9731c990
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Gui/Application.cpp
View File

@@ -523,21 +523,23 @@ void Application::open(const char* FileName, const char* Module)
if (Module != 0) {
try {
if(File.hasExtension("FCStd")) {
if (File.hasExtension("FCStd")) {
bool handled = false;
std::string filepath = File.filePath();
for(auto &v : d->documents) {
for (auto &v : d->documents) {
auto doc = v.second->getDocument();
std::string fi = Base::FileInfo(doc->FileName.getValue()).filePath();
if(filepath == fi) {
if (filepath == fi) {
handled = true;
Command::doCommand(Command::App, "FreeCADGui.reload('%s')", doc->getName());
break;
}
}
if(!handled)
Command::doCommand(Command::App, "FreeCAD.openDocument('%s')", FileName);
} else {
if (!handled)
Command::doCommand(Command::App, "FreeCAD.openDocument('%s')", unicodepath.c_str());
}
else {
// issue module loading
Command::doCommand(Command::App, "import %s", Module);