Changeset 9f1ad33 in tol

Timestamp:

Mar 25, 2011, 2:15:12 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

eb5dfc6

Parents:

b0b8f73

Message:

Fixes #1143

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3361 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/bbasic/out.cpp (modified) (9 diffs)

tol/bbasic/out.cpp

@@ -386 +386 @@
 //--------------------------------------------------------------------
 {
+  if(!BOut::IsEnabled() || (!BOut::errorHci_ && !BOut::errorTerm_)) { return; }
   if(!BOut::IsEnabled()) { return; }
   /*BText info =  "\nERROR: ";
@@ -406 +407 @@
 //--------------------------------------------------------------------
 {
-  if(!BOut::IsEnabled()) { return; }
+  if(!BOut::IsEnabled() || (!BOut::warningHci_ && !BOut::warningTerm_)) { return; }
   /*BText info =  "\nWARNING: ";
   info += txt + "\n";*/
@@ -424 +425 @@
 //--------------------------------------------------------------------
 {
-  if(!BOut::IsEnabled()) { return; }
+  if(!BOut::IsEnabled() || (!BOut::warningHci_ && !BOut::warningTerm_)) { return; }
   BText info = I2("\nDeprecated: ","\nDesaprobado: ");
   info += txt + "\n";
@@ -438 +439 @@
 //--------------------------------------------------------------------
 {
-  if(!BOut::IsEnabled()) { return; }
+  if(!BOut::IsEnabled() || (!BOut::stdHci_ && !BOut::stdTerm_)) { return; }
   BOut::Write(txt, BOut::stdHci_, BOut::stdTerm_);
 }
@@ -447 +448 @@
 void Info(const BText& txt)
 {
-  if(!BOut::IsEnabled()) { return; }
+  if(!BOut::IsEnabled() || (!BOut::infoHci_ && !BOut::infoTerm_)) { return; }
   BOut::Write(txt, BOut::infoHci_, BOut::infoTerm_);
 }
@@ -471 +472 @@
 //--------------------------------------------------------------------
 {
-  if(!BOut::IsEnabled()) { return; }
+  if(!BOut::IsEnabled() || (!BOut::traceHci_ && !BOut::traceTerm_)) { return; }
   BText info = BText("\nTRACE ") +SystemInfo() + "\n" + txt + "\n";
   BOut::Write(info, BOut::traceHci_, BOut::traceTerm_);
@@ -500 +501 @@
 //--------------------------------------------------------------------
 {
-  if(!BOut::IsEnabled()) { return; }
+  if(!BOut::IsEnabled() || (!hci && !term)) { return; }
   if(hci)
   {
@@ -515 +516 @@
     }
   }
-  if(BOut::HasDumpFile()&&file_)
+  if(BOut::HasDumpFile() && file_)
   {
     fprintf(file_,"%s",txt.String());
@@ -521 +522 @@
   }
 }
-
 
 //--------------------------------------------------------------------