Browse Source

Fix call on null object, unititialized bool

pull/1684/head
tux3 10 years ago
parent
commit
4306f87df4
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
  1. 8
      src/audio.cpp
  2. 2
      src/widget/form/chatform.cpp

8
src/audio.cpp

@ -156,7 +156,9 @@ void Audio::openInput(const QString& inDevDescr)
else else
qDebug() << "Opening audio input "<<inDevDescr; qDebug() << "Opening audio input "<<inDevDescr;
Core::getInstance()->resetCallSources(); // Force to regen each group call's sources Core* core = Core::getInstance();
if (core)
core->resetCallSources(); // Force to regen each group call's sources
// Restart the capture if necessary // Restart the capture if necessary
if (userCount.load() != 0 && alInDev) if (userCount.load() != 0 && alInDev)
@ -210,7 +212,9 @@ void Audio::openOutput(const QString& outDevDescr)
qDebug() << "Opening audio output " + outDevDescr; qDebug() << "Opening audio output " + outDevDescr;
} }
Core::getInstance()->resetCallSources(); // Force to regen each group call's sources Core* core = Core::getInstance();
if (core)
core->resetCallSources(); // Force to regen each group call's sources
} }
void Audio::closeInput() void Audio::closeInput()

2
src/widget/form/chatform.cpp

@ -50,7 +50,7 @@
ChatForm::ChatForm(Friend* chatFriend) ChatForm::ChatForm(Friend* chatFriend)
: f(chatFriend) : f(chatFriend)
, callId(0) , callId{0}, isTyping{false}
{ {
nameLabel->setText(f->getDisplayedName()); nameLabel->setText(f->getDisplayedName());

Loading…
Cancel
Save