Skip to content

Commit 71a7de6

Browse files
committed
[FIX] Fix loading projects with . in name
At least on Windows 2.18.qgs is a valid name for a file.
1 parent 2c53630 commit 71a7de6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/app/qgisapp.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -5947,20 +5947,20 @@ void QgisApp::openFile( const QString &fileName )
59475947
{
59485948
// check to see if we are opening a project file
59495949
QFileInfo fi( fileName );
5950-
if ( fi.completeSuffix() == QLatin1String( "qgs" ) || fi.completeSuffix() == QLatin1String( "qgz" ) )
5950+
if ( fi.suffix() == QLatin1String( "qgs" ) || fi.suffix() == QLatin1String( "qgz" ) )
59515951
{
59525952
QgsDebugMsg( "Opening project " + fileName );
59535953
openProject( fileName );
59545954
}
5955-
else if ( fi.completeSuffix() == QLatin1String( "qlr" ) )
5955+
else if ( fi.suffix() == QLatin1String( "qlr" ) )
59565956
{
59575957
openLayerDefinition( fileName );
59585958
}
5959-
else if ( fi.completeSuffix() == QLatin1String( "qpt" ) )
5959+
else if ( fi.suffix() == QLatin1String( "qpt" ) )
59605960
{
59615961
openTemplate( fileName );
59625962
}
5963-
else if ( fi.completeSuffix() == QLatin1String( "py" ) )
5963+
else if ( fi.suffix() == QLatin1String( "py" ) )
59645964
{
59655965
runScript( fileName );
59665966
}

src/core/qgsdataitem.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ QVector<QgsDataItem *> QgsDirectoryItem::createChildren()
798798

799799
if ( fileInfo.suffix() == QLatin1String( "qgs" ) || fileInfo.suffix() == QLatin1String( "qgz" ) )
800800
{
801-
QgsDataItem *item = new QgsProjectItem( this, fileInfo.baseName(), path );
801+
QgsDataItem *item = new QgsProjectItem( this, fileInfo.completeBaseName(), path );
802802
children.append( item );
803803
continue;
804804
}

0 commit comments

Comments
 (0)