Skip to content

Commit

Permalink
Followup 2675c42
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Jul 13, 2016
1 parent 2675c42 commit c226e57
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 deletions src/core/qgsvectordataprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -132,24 +132,18 @@ int QgsVectorDataProvider::capabilities() const

void QgsVectorDataProvider::setEncoding( const QString& e )
{
QTextCodec* ncodec = QTextCodec::codecForName( e.toLocal8Bit().constData() );
if ( ncodec )
mEncoding = QTextCodec::codecForName( e.toLocal8Bit().constData() );

if ( !mEncoding && e != "System" )
{
mEncoding = ncodec;
QgsMessageLog::logMessage( tr( "Codec %1 not found. Falling back to system locale" ).arg( e ) );
mEncoding = QTextCodec::codecForName( "System" );
}
else
{
if ( e != "System" )
{
QgsMessageLog::logMessage( tr( "Codec %1 not found. Falling back to system locale" ).arg( e ) );
mEncoding = QTextCodec::codecForName( "System" );
}

if ( !mEncoding )
mEncoding = QTextCodec::codecForLocale();
if ( !mEncoding )
mEncoding = QTextCodec::codecForLocale();

Q_ASSERT( mEncoding );
}
Q_ASSERT( mEncoding );
}

QString QgsVectorDataProvider::encoding() const
Expand Down

0 comments on commit c226e57

Please sign in to comment.