Browse Source

refs #795 Syncronizing with release commit:76aea2384baf640b800599480b02211aff4955c7 build:201803052119.

git-svn-id: https://help.cyberplat.com/svn@708 03a3ef96-f0a9-4432-b0b0-a3692ed642c1
tags/3.11.0
svn 3 years ago
parent
commit
b51cc44834
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      3.0/src/modules/Hardware/Common/src/SafePerformer/SafePerformer.cpp
  2. +1
    -1
      3.0/src/modules/Hardware/FR/src/OPOSMStarTUPK/OPOSMStarTUPK.cpp

+ 2
- 2
3.0/src/modules/Hardware/Common/src/SafePerformer/SafePerformer.cpp View File

@@ -39,7 +39,7 @@ void SafePerformerThread::onTask(const STaskData & aData)
LOG(mLog, LogLevel::Error, QString("Task was performed for %1 ms").arg(performingTime));
aData.changePerformingTimeout(aData.context, aData.timeout, performingTime);

if (!aData.forwardingTask._Empty())
if (aData.forwardingTask)
{
LOG(mLog, LogLevel::Normal, "Going to forwarding task");

@@ -57,7 +57,7 @@ SafePerformer::SafePerformer(ILog * aLog) : mLog(aLog), mResult(false)
//--------------------------------------------------------------------------------
ETaskResult::Enum SafePerformer::process(const STaskData & aData)
{
if (aData.task._Empty())
if (!aData.task)
{
return ETaskResult::Invalid;
}


+ 1
- 1
3.0/src/modules/Hardware/FR/src/OPOSMStarTUPK/OPOSMStarTUPK.cpp View File

@@ -568,7 +568,7 @@ bool OPOSMStarTUPK::fixError(EFiscalPrinterCommand::Enum aCommand, TBoolMethod a
return false;
}

if (!aFunction._Empty())
if (aFunction)
{
mLastHandledOperations.append(aFunction);
}


Loading…
Cancel
Save