X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1506cc6641867800e11b0bdb6f9df87721d9ddc2..cbb003b1053e30ea93a5cb956c360a4a39c35622:/src/generic/grid.cpp

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index a0c9646da9..bdd93204b5 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -10194,7 +10194,7 @@ void wxGrid::SetCellSize( int row, int col, int num_rows, int num_cols )
                       wxT("wxGrid::SetCellSize setting cell size to < 1"));
 
         // if this was already a multicell then "turn off" the other cells first
-        if ((cell_rows > 1) || (cell_rows > 1))
+        if ((cell_rows > 1) || (cell_cols > 1))
         {
             int i, j;
             for (j=row; j < row + cell_rows; j++)