Revision | e252e46a9d0fcdd83bfe0d40537fcc7f677f8af3 (tree) |
---|---|
Zeit | 2020-06-27 22:43:20 |
Autor | Takashi Sawanaka <sdottaka@user...> |
Commiter | Takashi Sawanaka |
Fix GitHub issue #362: opening same file (2)
@@ -743,11 +743,11 @@ void CMergeDoc::ShowRescanError(int nRescanResult, IDENTLEVEL identical) | ||
743 | 743 | nFlags &= ~MB_DONT_DISPLAY_AGAIN; |
744 | 744 | } |
745 | 745 | if ((m_nBuffers == 2 && !m_filePaths.GetLeft().empty() && !m_filePaths.GetRight().empty() && |
746 | - strutils::compare_nocase(m_filePaths.GetLeft(), m_filePaths.GetRight())) == 0 || | |
746 | + strutils::compare_nocase(m_filePaths.GetLeft(), m_filePaths.GetRight()) == 0) || | |
747 | 747 | (m_nBuffers == 3 && !m_filePaths.GetLeft().empty() && !m_filePaths.GetMiddle().empty() && !m_filePaths.GetRight().empty() && |
748 | - strutils::compare_nocase(m_filePaths.GetLeft(), m_filePaths.GetRight()) == 0 || | |
749 | - strutils::compare_nocase(m_filePaths.GetMiddle(), m_filePaths.GetRight()) == 0 || | |
750 | - strutils::compare_nocase(m_filePaths.GetLeft(), m_filePaths.GetMiddle()) == 0)) | |
748 | + (strutils::compare_nocase(m_filePaths.GetLeft(), m_filePaths.GetRight()) == 0 || | |
749 | + strutils::compare_nocase(m_filePaths.GetMiddle(), m_filePaths.GetRight()) == 0 || | |
750 | + strutils::compare_nocase(m_filePaths.GetLeft(), m_filePaths.GetMiddle()) == 0))) | |
751 | 751 | { |
752 | 752 | // compare file to itself, a custom message so user may hide the message in this case only |
753 | 753 | s = _("The same file is opened in both panels."); |