merge, remove no correct variable in_sync for delegagtes

bitshares · Aug 1, 2014 · 3448f7c · 3448f7c
2 parents 3b3724f + 74bd090
commit 3448f7c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/libraries/client/client.cpp b/libraries/client/client.cpp
@@ -744,7 +744,6 @@ config load_config( const fc::path& datadir )
               {
                   try
                   {
-                      FC_ASSERT( _in_sync, "Blockchain must be synced to produce blocks!" );
                       FC_ASSERT( network_get_connection_count() >= _min_delegate_connection_count,
                                  "Client must have ${count} connections before you may produce blocks!",
                                  ("count",_min_delegate_connection_count) );

diff --git a/setenv.bat b/setenv.bat
@@ -6,7 +6,7 @@ set OPENSSL_ROOT=%BITSHARES_ROOT%\OpenSSL
 set OPENSSL_ROOT_DIR=%OPENSSL_ROOT%
 set OPENSSL_INCLUDE_DIR=%OPENSSL_ROOT%\include
 set DBROOTDIR=%BITSHARES_ROOT%\BerkeleyDB
-set QTDIR=%BITSHARES_ROOT%\Qt5.3.1\5.3\msvc2013
+set QTDIR=%BITSHARES_ROOT%\QT
 set ICUROOT=%BITSHARES_ROOT%\ICU
 set BOOST_ROOT=%BITSHARES_ROOT%\boost_1.55