StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #370 from JFreegman/master

Browse Source 
Fixed two bugs
This commit is contained in:
irungentoo 2013-08-07 06:04:11 -07:00
commit 48d7d60a47
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/Messenger.c
View File

@ -116,8 +116,8 @@ int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length)
return FAERR_ALREADYSENT;
uint32_t i;
for (i = 0; i < numfriends && i < MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */
if(friendlist[i].status == NOFRIEND) {
for (i = 0; i <= numfriends && i <= MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */
if (friendlist[i].status == NOFRIEND) {
DHT_addfriend(client_id);
friendlist[i].status = FRIEND_ADDED;
friendlist[i].crypt_connection_id = -1;
@ -141,7 +141,7 @@ int m_addfriend_norequest(uint8_t * client_id)
if (getfriend_id(client_id) != -1)
return -1;
uint32_t i;
for (i = 0; i < numfriends && i < MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */
for (i = 0; i <= numfriends && i <= MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */
if(friendlist[i].status == NOFRIEND) {
DHT_addfriend(client_id);
friendlist[i].status = FRIEND_REQUESTED;

13
testing/toxic/main.c
View File

@ -249,6 +249,7 @@ static void load_data(char *path)
static void draw_bar()
{
static int odd = 0;
int blinkrate = 30;
attron(COLOR_PAIR(4));
mvhline(LINES - 2, 0, '_', COLS);
@ -266,14 +267,13 @@ static void draw_bar()
if (i == active_window)
attron(A_BOLD);
odd = (odd+1) % 10;
if (windows[i].blink && (odd < 5)) {
odd = (odd+1) % blinkrate;
if (windows[i].blink && (odd < (blinkrate/2))) {
attron(COLOR_PAIR(3));
}
printw(" %s", windows[i].title);
if (windows[i].blink && (odd < 5)) {
attron(COLOR_PAIR(3));
if (windows[i].blink && (odd < (blinkrate/2))) {
attroff(COLOR_PAIR(3));
}
if (i == active_window) {
attroff(A_BOLD);
@ -375,9 +375,8 @@ int main(int argc, char *argv[])
ch = getch();
if (ch == '\t' || ch == KEY_BTAB)
set_active_window(ch);
else if (ch != ERR) {
else if (ch != ERR)
a->onKey(a, ch);
}
}
return 0;
}