Merge remote-tracking branch 'origin/release/20.04'

remotes/origin/work/aacid/use_mimes_open_dialog
Albert Astals Cid 6 years ago
commit 7a51799484
  1. 4
      generators/djvu/kdjvu.cpp

@ -670,8 +670,8 @@ bool KDjVu::openFile( const QString & fileName )
if ( d->m_djvu_document ) if ( d->m_djvu_document )
closeFile(); closeFile();
// load the document... // load the document..., use UTF-8 variant to work on Windows, too, see bug 422500
d->m_djvu_document = ddjvu_document_create_by_filename( d->m_djvu_cxt, QFile::encodeName( fileName ).constData(), true ); d->m_djvu_document = ddjvu_document_create_by_filename_utf8( d->m_djvu_cxt, fileName.toUtf8().constData(), true );
if ( !d->m_djvu_document ) return false; if ( !d->m_djvu_document ) return false;
// ...and wait for its loading // ...and wait for its loading
wait_for_ddjvu_message( d->m_djvu_cxt, DDJVU_DOCINFO ); wait_for_ddjvu_message( d->m_djvu_cxt, DDJVU_DOCINFO );

Loading…
Cancel
Save