Skip to content
Snippets Groups Projects
Commit 94457576 authored by stefan's avatar stefan
Browse files

Fix for FileLoader, catch exception when passed FileHandler throws exception

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2488 5a81b35b-ba03-0410-adc8-b2c5c5119f08
parent e58e3670
No related branches found
No related tags found
No related merge requests found
...@@ -135,21 +135,26 @@ void FileLoader::AddToScene(const QString& filename, gfx::GfxObjP obj) ...@@ -135,21 +135,26 @@ void FileLoader::AddToScene(const QString& filename, gfx::GfxObjP obj)
gfx::GfxObjP FileLoader::NoHandlerFound(const QString& filename) gfx::GfxObjP FileLoader::NoHandlerFound(const QString& filename)
{ {
FileTypeDialog dialog(filename); FileTypeDialog dialog(filename);
if(dialog.exec()){ try{
if(dialog.GetEntityHandler()){ if(dialog.exec()){
return TryLoadEntity(filename, dialog.GetEntityHandler()); if(dialog.GetEntityHandler()){
} return TryLoadEntity(filename, dialog.GetEntityHandler());
if(dialog.GetSequenceHandler()){ }
return TryLoadAlignment(filename, dialog.GetSequenceHandler()); if(dialog.GetSequenceHandler()){
} return TryLoadAlignment(filename, dialog.GetSequenceHandler());
if(dialog.GetSurfaceHandler()){ }
return TryLoadSurface(filename,dialog.GetSurfaceHandler()); if(dialog.GetSurfaceHandler()){
} return TryLoadSurface(filename,dialog.GetSurfaceHandler());
#if OST_IMG_ENABLED }
if(dialog.GetMapHandler()){ #if OST_IMG_ENABLED
return TryLoadMap(filename,dialog.GetMapHandler()); if(dialog.GetMapHandler()){
return TryLoadMap(filename,dialog.GetMapHandler());
}
#endif
} }
#endif }
catch (io::IOException& e) {
FileLoader::HandleError(e,IO_LOADING,filename);
} }
return gfx::GfxObjP(); return gfx::GfxObjP();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment