suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

when using --single-instance option make relative path names absolute

Browse Source
This commit is contained in:
wmayer 2016-10-14 18:01:11 +02:00
parent d515fbc05a
commit 3e041850f7
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Gui/Application.cpp
View File

@ -1537,9 +1537,19 @@ void Application::runApplication(void)
if (it != cfg.end() && mainApp.isRunning()) { if (it != cfg.end() && mainApp.isRunning()) {
// send the file names to be opened to the server application so that this // send the file names to be opened to the server application so that this
// opens them // opens them
QDir cwd = QDir::current();
std::list<std::string> files = App::Application::getCmdLineFiles(); std::list<std::string> files = App::Application::getCmdLineFiles();
for (std::list<std::string>::iterator jt = files.begin(); jt != files.end(); ++jt) { for (std::list<std::string>::iterator jt = files.begin(); jt != files.end(); ++jt) {
QByteArray msg(jt->c_str(), static_cast<int>(jt->size())); QString fn = QString::fromUtf8(jt->c_str(), static_cast<int>(jt->size()));
QFileInfo fi(fn);
// if path name is relative make it absolute because the running instance
// cannot determine the full path when trying to load the file
if (fi.isRelative()) {
fn = cwd.absoluteFilePath(fn);
fn = QDir::cleanPath(fn);
}
QByteArray msg = fn.toUtf8();
msg.prepend("OpenFile:"); msg.prepend("OpenFile:");
if (!mainApp.sendMessage(msg)) { if (!mainApp.sendMessage(msg)) {
qWarning("Failed to send message to server"); qWarning("Failed to send message to server");