1
0
Fork 0

Merge branch 'master' into doxygen

Conflicts:
	x64_dbg_dbg/console.cpp
This commit is contained in:
Mr. eXoDia 2014-12-10 23:07:42 +01:00
commit b989c0b4c5
2 changed files with 4 additions and 4 deletions

View File

@ -10,8 +10,6 @@
@brief The msg[ 66000].
*/
static char msg[66000];
/**
@fn void dputs(const char* text)
@ -37,7 +35,7 @@ void dprintf(const char* format, ...)
{
va_list args;
va_start(args, format);
*msg = 0;
vsnprintf(msg, sizeof(msg), format, args);
Memory<char*> msg(66000);
vsnprintf(msg, msg.size(), format, args);
GuiAddLogMessage(msg);
}

View File

@ -44,6 +44,7 @@ void StatusLabel::debugStateChangedSlot(DBGSTATE state)
default:
break;
}
this->repaint();
}
void StatusLabel::logUpdate(QString message)
@ -52,4 +53,5 @@ void StatusLabel::logUpdate(QString message)
labelText = "";
labelText += message;
setText(labelText);
this->repaint();
}