comparison kdiff3/src-QT4/pdiff.cpp @ 98:236f1c9c3fbf

- Fixed redundant empty line in history merge.
- Fixed inconsistency in directory view info area after scan.
- Fixed crash if trying to disable "Dir & Text Split Screen View" and no
  file is loaded.
- Fixed test dialog for regular expressions.

       if ( m_pMainWidget!=0 )
          m_pMainWidget->show();
    }
    else
    {
-      if ( m_pMainWidget!=0 )
+      bool bTextDataAvailable = ( m_sd1.hasData() || m_sd2.hasData() || m_sd3.hasData() );
+      if ( m_pMainWidget!=0 &&  bTextDataAvailable )
       {
          m_pMainWidget->show();
          m_pDirectoryMergeSplitter->hide();
       }
       else if ( m_bDirCompare )