Skip to content

Commit

Permalink
If current line is being omitted, GetInfo (124) will return true
Browse files Browse the repository at this point in the history
  • Loading branch information
nickgammon committed Nov 28, 2015
1 parent f575af7 commit e3a9650
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
16 changes: 8 additions & 8 deletions ProcessPreviousLine.cpp
Expand Up @@ -452,13 +452,13 @@ assemble the full text of the original line.

// triggers might set these
bool bNoLog = !m_bLogOutput;
bool bNoOutput = false;
bool m_bLineOmittedFromOutput = false;
bool bChangedColour = false;

m_iCurrentActionSource = eInputFromServer;

if (!SendToAllPluginCallbacks (ON_PLUGIN_LINE_RECEIVED, strCurrentLine))
bNoOutput = true;
m_bLineOmittedFromOutput = true;

m_iCurrentActionSource = eUnknownActionSource;

Expand Down Expand Up @@ -607,7 +607,7 @@ assemble the full text of the original line.
strResponse,
prevpos,
bNoLog,
bNoOutput,
m_bLineOmittedFromOutput,
bChangedColour,
triggerList,
strExtraOutput,
Expand All @@ -626,7 +626,7 @@ assemble the full text of the original line.
strResponse,
prevpos,
bNoLog,
bNoOutput,
m_bLineOmittedFromOutput,
bChangedColour,
triggerList,
strExtraOutput,
Expand All @@ -652,7 +652,7 @@ assemble the full text of the original line.
strResponse,
prevpos,
bNoLog,
bNoOutput,
m_bLineOmittedFromOutput,
bChangedColour,
triggerList,
strExtraOutput,
Expand All @@ -665,7 +665,7 @@ assemble the full text of the original line.

// if we have changed the colour of this trigger, or omitted it from output,
// we must force an update or they won't see it
if (bNoOutput || bChangedColour)
if (m_bLineOmittedFromOutput || bChangedColour)
{
// notify view to update their selection ranges

Expand Down Expand Up @@ -735,7 +735,7 @@ assemble the full text of the original line.

// if omitting from output do that now

if (bNoOutput)
if (m_bLineOmittedFromOutput)
{

// delete all lines in this set
Expand Down Expand Up @@ -984,7 +984,7 @@ assemble the full text of the original line.
// check memory still OK
// _ASSERTE( _CrtCheckMemory( ) );

return bNoOutput;
return m_bLineOmittedFromOutput;

} // end of CMUSHclientDoc::ProcessPreviousLine

Expand Down
1 change: 1 addition & 0 deletions doc.h
Expand Up @@ -1374,6 +1374,7 @@ class CMUSHclientDoc : public CDocument
list<CPaneStyle> m_OutstandingLines;
bool m_bNotesNotWantedNow;
bool m_bDoingSimulate;
bool m_bLineOmittedFromOutput;

BOOL m_bScrollBarWanted; // true if we want to see scroll bars

Expand Down
1 change: 1 addition & 0 deletions doc_construct.cpp
Expand Up @@ -207,6 +207,7 @@ int i;
m_bVariablesChanged = false;
m_bNotesNotWantedNow = false;
m_bDoingSimulate = false;
m_bLineOmittedFromOutput = false;

m_view_number = 0;
m_LastFlushTime = CTime::GetCurrentTime();
Expand Down
1 change: 1 addition & 0 deletions scripting/methods/methods_info.cpp
Expand Up @@ -580,6 +580,7 @@ VARIANT CMUSHclientDoc::GetInfo(long InfoType)
case 121: SetUpVariantBool (vaResult, App.m_iCounterFrequency != 0); break;
case 122: SetUpVariantBool (vaResult, sqlite3_threadsafe() != 0); break;
case 123: SetUpVariantBool (vaResult, m_bDoingSimulate); break;
case 124: SetUpVariantBool (vaResult, m_bLineOmittedFromOutput); break;

case 201: SetUpVariantLong (vaResult, m_total_lines); break;
case 202: SetUpVariantLong (vaResult, m_new_lines); break;
Expand Down

0 comments on commit e3a9650

Please sign in to comment.