PATCH: [ 1386442 ] Local variable uses m_ prefix in CChildFrame

  Src: ChildFrm.cpp

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 186211f..9565bf5 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -1,3 +1,7 @@
+2005-12-21 Perry
+ PATCH: [ 1386442 ] Local variable uses m_ prefix in CChildFrame
+  Src: ChildFrm.cpp
+
 2005-12-19 Kimmo
  PATCH: [ 1384646 ] Replace Question icons with warning icons in messageboxes
   Src: DirActions.cpp FileFiltersDlg.cpp MainFrm.cpp MergeDoc.cpp PatchDlg.cpp

diff --git a/Src/ChildFrm.cpp b/Src/ChildFrm.cpp
index 4b954b8..858b3d7 100644 (file)
--- a/Src/ChildFrm.cpp
+++ b/Src/ChildFrm.cpp
@@ -409,10 +409,10 @@ void CChildFrame::ActivateFrame(int nCmdShow)
        int initialDiffHeight = ((CMergeDiffDetailView*)m_wndDetailSplitter.GetPane(1,0))->ComputeInitialHeight();
        UpdateDiffDockbarHeight(initialDiffHeight);
        // load docking positions and sizes
-       CDockState m_pDockState;
-       m_pDockState.LoadState(_T("Settings"));
-       if (EnsureValidDockState(m_pDockState)) // checks for valid so won't ASSERT
-               SetDockState(m_pDockState);
+       CDockState pDockState;
+       pDockState.LoadState(_T("Settings"));
+       if (EnsureValidDockState(pDockState)) // checks for valid so won't ASSERT
+               SetDockState(pDockState);
        // for the dimensions of the diff and location pane, use the CSizingControlBar loader
        m_wndLocationBar.LoadState(_T("Settings"));
        m_wndDetailBar.LoadState(_T("Settings"));