Skip to content

Commit

Permalink
[GRASS] fixed setting default value in input combo
Browse files Browse the repository at this point in the history
  • Loading branch information
blazek committed Oct 8, 2015
1 parent 35444c4 commit 7be1b64
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion src/plugins/grass/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,6 @@ INSTALL (FILES themes/default/grass_arrow.svg themes/default/grass_plus.svg them
IF(NOT WIN32)
INSTALL(DIRECTORY qtermwidget/kb-layouts/ DESTINATION "${KB_LAYOUT_DIR}" FILES_MATCHING PATTERN "*.keytab" )
INSTALL(DIRECTORY qtermwidget/kb-layouts/ DESTINATION "${KB_LAYOUT_DIR}" )
message(STATUS "Keyboard layouts will be installed in: ${KB_LAYOUT_DIR}")
INSTALL(DIRECTORY qtermwidget/color-schemes/ DESTINATION "${COLORSCHEMES_DIR}" FILES_MATCHING PATTERN "*.*schem*")
ENDIF(NOT WIN32)

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grass/qgsgrassmoduleparam.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ QgsGrassModuleOption::QgsGrassModuleOption( QgsGrassModule *module, QString key,
if ( mControlType == ComboBox )
{
mComboBox->addItem( desc );
if ( mAnswer.length() > 0 && desc == mAnswer )
if ( mAnswer.length() > 0 && val == mAnswer )
{
mComboBox->setCurrentIndex( mComboBox->count() - 1 );
}
Expand Down

0 comments on commit 7be1b64

Please sign in to comment.