Mercurial > hg > easyhg-kdiff3
changeset 91:fa1a49fc1ec1
Fix crash on start if word wrap is on, and fix for storing utf-8 without
BOM.
| author | joachim99 |
|---|---|
| date | Tue, 06 Jan 2009 22:31:57 +0000 |
| parents | e7e890126d9b |
| children | 4e6ebbbae925 |
| files | kdiff3/src-QT4/kdiff3.cpp kdiff3/src-QT4/mergeresultwindow.cpp kdiff3/src-QT4/pdiff.cpp |
| diffstat | 3 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/kdiff3/src-QT4/kdiff3.cpp Tue Jan 06 18:36:57 2009 +0000 +++ b/kdiff3/src-QT4/kdiff3.cpp Tue Jan 06 22:31:57 2009 +0000 @@ -139,6 +139,8 @@ m_bFileSaved = false; m_bTimerBlock = false; m_pHScrollBar = 0; + m_pDiffVScrollBar = 0; + m_pMergeVScrollBar = 0; viewToolBar = 0; // Needed before any file operations via FileAccess happen.
--- a/kdiff3/src-QT4/mergeresultwindow.cpp Tue Jan 06 18:36:57 2009 +0000 +++ b/kdiff3/src-QT4/mergeresultwindow.cpp Tue Jan 06 22:31:57 2009 +0000 @@ -2733,7 +2733,10 @@ QByteArray dataArray; QTextStream textOutStream(&dataArray, QIODevice::WriteOnly); - textOutStream.setGenerateByteOrderMark( true ); // Only for UTF-16 + if ( pEncoding->name()=="UTF-8" ) + textOutStream.setGenerateByteOrderMark( false ); // Shouldn't be necessary. Bug in Qt or docs + else + textOutStream.setGenerateByteOrderMark( true ); // Only for UTF-16 textOutStream.setCodec( pEncoding ); int line = 0;
--- a/kdiff3/src-QT4/pdiff.cpp Tue Jan 06 18:36:57 2009 +0000 +++ b/kdiff3/src-QT4/pdiff.cpp Tue Jan 06 22:31:57 2009 +0000 @@ -1628,7 +1628,8 @@ m_pDiffTextWindow3->update(); } - m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines+1 - m_DTWHeight) ); + if ( m_pDiffVScrollBar ) + m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines+1 - m_DTWHeight) ); if ( m_pDiffTextWindow1 ) { m_pDiffVScrollBar->setValue( m_pDiffTextWindow1->convertDiff3LineIdxToLine( firstD3LIdx ) );