[QGIS Commit] [qgis/Quantum-GIS] f457ec: Fix for crash on scale combobox popup

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: f457ece3eb41916716bf3da0c637b08a7f477175
      https://github.com/qgis/Quantum-GIS/commit/f457ece3eb41916716bf3da0c637b08a7f477175
  Author: Larry Shaffer <larrys at dakotacarto.com>
  Date:   2012-07-29 (Sun, 29 Jul 2012)

  Changed paths:
    M src/gui/qgsscalecombobox.cpp

  Log Message:
  -----------
  Fix for crash on scale combobox popup

- Fixes undocumented crash on clicking scale combobox, when it shows 'Invalid scale' (also in 1.8.0)
- 'Invalid scale' shows up on initial launch, but apparently not on New Project


  Commit: eac8bc8ca1b58b484dd1a758b826d367dba67731
      https://github.com/qgis/Quantum-GIS/commit/eac8bc8ca1b58b484dd1a758b826d367dba67731
  Author: Larry Shaffer <larrys at dakotacarto.com>
  Date:   2012-07-29 (Sun, 29 Jul 2012)

  Changed paths:
    M scripts/prepare-commit.sh

  Log Message:
  -----------
  Merge branch 'master' of github.com:qgis/Quantum-GIS


Compare: https://github.com/qgis/Quantum-GIS/compare/52eed922cbf7...eac8bc8ca1b5