From: Wladimir J. van der Laan <laanwj@gmail.com>
Date: Fri, 10 Feb 2012 17:31:21 +0000 (-0800)
Subject: Merge pull request #818 from laanwj/2012_02_win32_qtaccessible
X-Git-Tag: v0.4.0-unstable~129^2~225
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=26d9e2c19dc209ba5616e9fca9f521dd7ed94e81;hp=2e5a781c644f09c259ad24c83c1444e882eab819;p=novacoin.git

Merge pull request #818 from laanwj/2012_02_win32_qtaccessible

Enable accessible widgets Qt module on win32
---

diff --git a/doc/readme-qt.rst b/doc/readme-qt.rst
index 8fce96b..294f31a 100644
--- a/doc/readme-qt.rst
+++ b/doc/readme-qt.rst
@@ -1,39 +1,6 @@
 Bitcoin-qt: Qt4 GUI for Bitcoin
 ===============================
 
-Features
-========
-
-- All functionality of the Wx GUI, including wallet encryption
-
-- Compatibility with Linux (both GNOME and KDE), MacOSX and Windows
-
-- Notification on incoming / outgoing transactions (compatible with FreeDesktop and other desktop notification schemes)
-
-- General interface improvements: Splash screen, tabbed interface
-
-- Overview page with current balance, unconfirmed balance, and such
-
-- Better transaction list with status icons, real-time filtering and a context menu
-
-- Asks for confirmation before sending coins, for your own safety
-
-- CSV export of transactions and address book (for Excel bookkeeping)
-
-- Shows alternative icon when connected to testnet, so you never accidentally send real coins during testing
-
-- Shows a progress bar on initial block download, so that you don't have to wonder how many blocks it needs to download to be up to date
-
-- Sendmany support, send to multiple recipients at the same time
-
-- Multiple unit support, can show subdivided bitcoins (uBTC, mBTC) for users that like large numbers
-
-- Support for English, German, Russian and Dutch languages
-
-- Address books and transaction table can be sorted by any column
-
-- Accepts "bitcoin:" URLs from browsers and other sources through drag and drop
-
 Build instructions
 ===================
 
@@ -137,6 +104,20 @@ FreeDesktop notification interface through DBUS using the following qmake option
 
     qmake "USE_DBUS=1"
 
+Generation of QR codes
+-----------------------
+
+libqrencode may be used to generate QRCode images for payment requests. 
+It can be downloaded from http://fukuchi.org/works/qrencode/index.html.en, or installed via your package manager. Pass the USE_QRCODE 
+flag to qmake to control this:
+
++--------------+--------------------------------------------------------------------------+
+| USE_QRCODE=0 | (the default) No QRCode support - libarcode not required                 |
++--------------+--------------------------------------------------------------------------+
+| USE_QRCODE=1 | QRCode support enabled                                                   |
++--------------+--------------------------------------------------------------------------+
+
+
 Berkely DB version warning
 ==========================
 
diff --git a/src/main.cpp b/src/main.cpp
index f78133b..e4c6714 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -618,11 +618,15 @@ bool CTransaction::RemoveFromMemoryPool()
     // Remove transaction from memory pool
     CRITICAL_BLOCK(cs_mapTransactions)
     {
-        BOOST_FOREACH(const CTxIn& txin, vin)
-            mapNextTx.erase(txin.prevout);
-        mapTransactions.erase(GetHash());
-        nTransactionsUpdated++;
-        --nPooledTx;
+        uint256 hash = GetHash();
+        if (mapTransactions.count(hash))
+        {
+            BOOST_FOREACH(const CTxIn& txin, vin)
+                mapNextTx.erase(txin.prevout);
+            mapTransactions.erase(hash);
+            nTransactionsUpdated++;
+            --nPooledTx;
+        }
     }
     return true;
 }