StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr1758'

Browse Source
This commit is contained in:
tux3 2015-06-01 16:56:47 +02:00
commit b3ce364d5c
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/coreav.cpp
View File

@ -112,14 +112,14 @@ void Core::onAvMediaChange(void* toxav, int32_t callId, void* core)
Camera::getInstance()->subscribe();
calls[callId].videoEnabled = true;
calls[callId].sendVideoTimer->start();
emit ((Core*)core)->avMediaChange(friendId, callId, true);
emit static_cast<Core*>(core)->avMediaChange(friendId, callId, true);
}
else // Audio call
{
calls[callId].videoEnabled = false;
calls[callId].sendVideoTimer->stop();
Camera::getInstance()->unsubscribe();
emit ((Core*)core)->avMediaChange(friendId, callId, false);
emit static_cast<Core*>(core)->avMediaChange(friendId, callId, false);
}
return;

4
src/widget/widget.cpp
View File

@ -1459,7 +1459,7 @@ void Widget::hideFriends(QString searchString, Status status, bool hideAll)
FriendWidget* friendWidget = static_cast<FriendWidget*>(friends->itemAt(index)->widget());
QString friendName = friendWidget->getName();
if (!friendName.contains(searchString, Qt::CaseInsensitive) | hideAll)
if (!friendName.contains(searchString, Qt::CaseInsensitive) || hideAll)
friendWidget->setVisible(false);
else
friendWidget->setVisible(true);
@ -1476,7 +1476,7 @@ void Widget::hideGroups(QString searchString, bool hideAll)
GroupWidget* groupWidget = static_cast<GroupWidget*>(groups->itemAt(index)->widget());
QString groupName = groupWidget->getName();
if (!groupName.contains(searchString, Qt::CaseInsensitive) | hideAll)
if (!groupName.contains(searchString, Qt::CaseInsensitive) || hideAll)
groupWidget->setVisible(false);
else
groupWidget->setVisible(true);