Fix for Qt ram watch window save file symbol type parameter sometimes being undefined.
This commit is contained in:
parent
6a2e384469
commit
d4c2a7e2d9
|
@ -841,7 +841,7 @@ void RamWatchDialog_t::openWatchEditWindow( ramWatch_t *rw, int mode)
|
||||||
okButton->setDefault(true);
|
okButton->setDefault(true);
|
||||||
|
|
||||||
connect( okButton, SIGNAL(clicked(void)), &dialog, SLOT(accept(void)) );
|
connect( okButton, SIGNAL(clicked(void)), &dialog, SLOT(accept(void)) );
|
||||||
connect( cancelButton, SIGNAL(clicked(void)), &dialog, SLOT(reject(void)) );
|
connect( cancelButton, SIGNAL(clicked(void)), &dialog, SLOT(reject(void)) );
|
||||||
|
|
||||||
if ( rw != NULL )
|
if ( rw != NULL )
|
||||||
{
|
{
|
||||||
|
@ -871,8 +871,8 @@ void RamWatchDialog_t::openWatchEditWindow( ramWatch_t *rw, int mode)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
signedTypeBtn->setChecked( rw->type == 's' );
|
signedTypeBtn->setChecked( rw->type == 's' );
|
||||||
unsignedTypeBtn->setChecked( rw->type != 's' );
|
unsignedTypeBtn->setChecked( rw->type != 's' );
|
||||||
dataSize1Btn->setChecked( rw->size == 1 );
|
dataSize1Btn->setChecked( rw->size == 1 );
|
||||||
dataSize2Btn->setChecked( rw->size == 2 );
|
dataSize2Btn->setChecked( rw->size == 2 );
|
||||||
dataSize4Btn->setChecked( rw->size == 4 );
|
dataSize4Btn->setChecked( rw->size == 4 );
|
||||||
|
@ -880,8 +880,8 @@ void RamWatchDialog_t::openWatchEditWindow( ramWatch_t *rw, int mode)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
signedTypeBtn->setChecked( true );
|
signedTypeBtn->setChecked( true );
|
||||||
unsignedTypeBtn->setChecked( false );
|
unsignedTypeBtn->setChecked( false );
|
||||||
dataSize1Btn->setChecked( true );
|
dataSize1Btn->setChecked( true );
|
||||||
dataSize2Btn->setChecked( false );
|
dataSize2Btn->setChecked( false );
|
||||||
dataSize4Btn->setChecked( false );
|
dataSize4Btn->setChecked( false );
|
||||||
|
@ -911,7 +911,7 @@ void RamWatchDialog_t::openWatchEditWindow( ramWatch_t *rw, int mode)
|
||||||
if ( (rw == NULL) || mode )
|
if ( (rw == NULL) || mode )
|
||||||
{
|
{
|
||||||
ramWatchList.add_entry( notesEntry->text().toStdString().c_str(),
|
ramWatchList.add_entry( notesEntry->text().toStdString().c_str(),
|
||||||
addr, unsignedTypeBtn->isChecked(), size, isSep);
|
addr, unsignedTypeBtn->isChecked() ? 'u' : 's', size, isSep);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue