Mercurial > hg > svapp
comparison framework/MainWindowBase.cpp @ 75:d184cd01760c
* Fix #1844508 spurious error message on .svl file import
author | Chris Cannam |
---|---|
date | Thu, 13 Dec 2007 18:06:22 +0000 |
parents | 864703bf64ac |
children | 2da0999dac1d |
comparison
equal
deleted
inserted
replaced
74:864703bf64ac | 75:d184cd01760c |
---|---|
1104 | 1104 |
1105 if (!source.isRemote()) { | 1105 if (!source.isRemote()) { |
1106 registerLastOpenedFilePath(FileFinder::LayerFile, path); // for file dialog | 1106 registerLastOpenedFilePath(FileFinder::LayerFile, path); // for file dialog |
1107 } | 1107 } |
1108 | 1108 |
1109 return FileOpenSucceeded; | |
1110 | |
1109 } else { | 1111 } else { |
1110 | 1112 |
1111 try { | 1113 try { |
1112 | 1114 |
1113 Model *model = DataFileReaderFactory::load | 1115 Model *model = DataFileReaderFactory::load |
1138 return FileOpenCancelled; | 1140 return FileOpenCancelled; |
1139 } | 1141 } |
1140 } | 1142 } |
1141 } | 1143 } |
1142 | 1144 |
1143 source.setLeaveLocalFile(true); | |
1144 return FileOpenFailed; | 1145 return FileOpenFailed; |
1145 } | 1146 } |
1146 | 1147 |
1147 MainWindowBase::FileOpenStatus | 1148 MainWindowBase::FileOpenStatus |
1148 MainWindowBase::openImage(FileSource source) | 1149 MainWindowBase::openImage(FileSource source) |