diff -r c291a9099016 -r 4065ba5e9155 core-legacy/concommands.cpp --- a/core-legacy/concommands.cpp Tue Nov 24 08:06:16 2009 -0600 +++ b/core-legacy/concommands.cpp Thu Dec 10 00:59:50 2009 -0600 @@ -176,29 +176,24 @@ } // Display user messages - if (g_SmmAPI.MsgCacheSuccessful()) + const char *msgname; + int msgsize; + int msgcount = g_SmmAPI.GetUserMessageCount(); + + if (msgcount > 0) { - const char *msgname; - int msgsize; - int msgcount = g_SmmAPI.GetUserMessageCount(); - - if (msgcount > 0) - { - CONMSG(" User Messages: %-32.31s %-5s %-5s\n", "Name", "Index", "Size"); + CONMSG(" User Messages: %-32.31s %-5s %-5s\n", "Name", "Index", "Size"); - for (int i = 0; i < msgcount; i++) - { - msgname = g_SmmAPI.GetUserMessage(i, &msgsize); - - CONMSG(" %-32.31s %-5d %-5d\n", msgname, i, msgsize); - } + for (int i = 0; i < msgcount; i++) + { + msgname = g_SmmAPI.GetUserMessage(i, &msgsize); - CONMSG(" %d user message%s in total\n", msgcount, (msgcount > 1) ? "s" : ""); - } else { - CONMSG(" User Messages: None\n"); + CONMSG(" %-32.31s %-5d %-5d\n", msgname, i, msgsize); } + + CONMSG(" %d user message%s in total\n", msgcount, (msgcount > 1) ? "s" : ""); } else { - CONMSG(" User Messages: Failed to get list of user messages\n"); + CONMSG(" User Messages: None\n"); } return;