mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Fixes two compiler warnings:
- call of GeneralPage() with null pointer rather than the boolean false - decomposition of a suspicious line into safe expressions (problem related to sequence points) git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3273 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
7dd79e650f
commit
36a9159884
@ -170,7 +170,8 @@ MessagesDialog::LockUpdate::LockUpdate (MessagesDialog *pDialog, bool bUpdate)
|
||||
|
||||
MessagesDialog::LockUpdate::~LockUpdate ()
|
||||
{
|
||||
m_pDialog->m_nLockUpdate = qMax (--m_pDialog->m_nLockUpdate, 0);
|
||||
if(--m_pDialog->m_nLockUpdate < 0)
|
||||
m_pDialog->m_nLockUpdate = 0;
|
||||
|
||||
if (m_bUpdate && m_pDialog->m_nLockUpdate == 0) {
|
||||
m_pDialog->insertMessages();
|
||||
|
@ -100,7 +100,7 @@ RSettingsWin::initStackedWidget()
|
||||
stackedWidget->setCurrentIndex(-1);
|
||||
stackedWidget->removeWidget(stackedWidget->widget(0));
|
||||
|
||||
stackedWidget->addWidget(new GeneralPage(false));
|
||||
stackedWidget->addWidget(new GeneralPage(0));
|
||||
stackedWidget->addWidget(new ServerPage());
|
||||
stackedWidget->addWidget(new TransferPage());
|
||||
stackedWidget->addWidget(new DirectoriesPage());
|
||||
|
Loading…
Reference in New Issue
Block a user