# HG changeset patch
# User joachim99
# Date 1231281117 0
# Node ID fa1a49fc1ec105dd98f4ca819cb172f4cc773e7d
# Parent  e7e890126d9bbab43858b718a9f5cd7d33e09f22
Fix crash on start if word wrap is on, and fix for storing utf-8 without
BOM.

diff -r e7e890126d9b -r fa1a49fc1ec1 kdiff3/src-QT4/kdiff3.cpp
--- 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.
diff -r e7e890126d9b -r fa1a49fc1ec1 kdiff3/src-QT4/mergeresultwindow.cpp
--- 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;
diff -r e7e890126d9b -r fa1a49fc1ec1 kdiff3/src-QT4/pdiff.cpp
--- 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 ) );