empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix mixup between macro and field

Browse source
This commit is contained in:
Ilari Liusvaara 2011-11-13 18:58:02 +02:00
parent 769f90c2dc
commit cc41fb792e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/core/messagebuffer.hpp
View file

@ -190,7 +190,7 @@ public:
size_t get_max_window_size() throw();
private:
void send_notifications();
std::map<uint64_t, std::string> messages;
std::map<uint64_t, std::string> messages_buf;
uint64_t first_present_message;
uint64_t next_message_number;
uint64_t window_start;

10
src/core/messagebuffer.cpp
View file

@ -24,10 +24,10 @@ messagebuffer::messagebuffer(size_t maxmessages, size_t windowsize) throw(std::b
void messagebuffer::add_message(const std::string& msg) throw(std::bad_alloc, std::runtime_error)
{
messages[next_message_number++] = msg;
messages_buf[next_message_number++] = msg;
//If too many messages, erase one.
if(messages.size() > max_messages)
messages.erase(first_present_message++);
if(messages_buf.size() > max_messages)
messages_buf.erase(first_present_message++);
//Force scrolling if message in window got erased.
if(window_start < first_present_message) {
window_start = first_present_message;
@ -42,9 +42,9 @@ void messagebuffer::add_message(const std::string& msg) throw(std::bad_alloc, st
const std::string& messagebuffer::get_message(size_t msgnum) throw(std::bad_alloc, std::logic_error)
{
if(!messages.count(msgnum))
if(!messages_buf.count(msgnum))
throw std::logic_error("Invalid message number");
return messages[msgnum];
return messages_buf[msgnum];
}
size_t messagebuffer::get_msg_first() throw()