Merge pull request #1976 from bitshares/release

Release -> master
bitshares · Sep 5, 2019 · ca8e352 · ca8e352
2 parents ba19d55 + bae1d73
commit ca8e352
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp
@@ -379,6 +379,13 @@ void database::clear_expired_orders()
             cancel_settle_order(order);
             continue;
          }
+         if( GRAPHENE_100_PERCENT == mia.options.force_settlement_offset_percent ) // settle something for nothing
+         {
+            ilog( "Canceling a force settlement in ${asset} because settlement offset is 100%",
+                  ("asset", mia_object.symbol));
+            cancel_settle_order(order);
+            continue;
+         }
          if( max_settlement_volume.asset_id != current_asset )
             max_settlement_volume = mia_object.amount(mia.max_force_settlement_volume(mia_object.dynamic_data(*this).current_supply));
          // When current_asset_finished is true, this would be the 2nd time processing the same order.