Fix issue #1598: Starting Pane Consistency

diff --git a/Src/HexMergeDoc.cpp b/Src/HexMergeDoc.cpp
index a2f4990..5afa038 100644 (file)
--- a/Src/HexMergeDoc.cpp
+++ b/Src/HexMergeDoc.cpp
@@ -558,7 +558,7 @@ void CHexMergeDoc::MoveOnLoad(int nPane, int)
 {
        if (nPane < 0)
        {
-               nPane = GetOptionsMgr()->GetInt(OPT_ACTIVE_PANE);
+               nPane = (m_nBufferType[0] != BUFFERTYPE::UNNAMED) ? GetOptionsMgr()->GetInt(OPT_ACTIVE_PANE) : 0;
                if (nPane < 0 || nPane >= m_nBuffers)
                        nPane = 0;
        }

diff --git a/Src/ImgMergeFrm.cpp b/Src/ImgMergeFrm.cpp
index 50797dd..05d0850 100644 (file)
--- a/Src/ImgMergeFrm.cpp
+++ b/Src/ImgMergeFrm.cpp
@@ -267,7 +267,7 @@ void CImgMergeFrame::MoveOnLoad(int nPane, int)
 {
        if (nPane < 0)
        {
-               nPane = GetOptionsMgr()->GetInt(OPT_ACTIVE_PANE);
+               nPane = (m_nBufferType[0] != BUFFERTYPE::UNNAMED) ? GetOptionsMgr()->GetInt(OPT_ACTIVE_PANE) : 0;
                if (nPane < 0 || nPane >= m_pImgMergeWindow->GetPaneCount())
                        nPane = 0;
        }

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index bd9e88e..c9d2373 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -3340,7 +3340,7 @@ void CMergeDoc::MoveOnLoad(int nPane, int nLineIndex, bool bRealLine, int nCharI
 {
        if (nPane < 0)
        {
-               nPane = GetOptionsMgr()->GetInt(OPT_ACTIVE_PANE);
+               nPane = (m_nBufferType[0] != BUFFERTYPE::UNNAMED) ? GetOptionsMgr()->GetInt(OPT_ACTIVE_PANE) : 0;
                if (nPane < 0 || nPane >= m_nBuffers)
                        nPane = 0;
        }

diff --git a/Src/WebPageDiffFrm.cpp b/Src/WebPageDiffFrm.cpp
index a2518ec..26c79bf 100644 (file)
--- a/Src/WebPageDiffFrm.cpp
+++ b/Src/WebPageDiffFrm.cpp
@@ -234,7 +234,7 @@ void CWebPageDiffFrame::MoveOnLoad(int nPane, int)
 {
        if (nPane < 0)
        {
-               nPane = GetOptionsMgr()->GetInt(OPT_ACTIVE_PANE);
+               nPane = (m_nBufferType[0] != BUFFERTYPE::UNNAMED) ? GetOptionsMgr()->GetInt(OPT_ACTIVE_PANE) : 0;
                if (nPane < 0 || nPane >= m_pWebDiffWindow->GetPaneCount())
                        nPane = 0;
        }