<p>Depends on <a class="issue-link js-issue-link" data-error-text="Failed to load issue title" data-id="319108527" data-permission-text="Issue title is private" data-url="https://github.com/bisq-network/bisq-common/issues/22" href="https://github.com/bisq-network/bisq-common/pull/22">bisq-network/bisq-common#22</a> and <a class="issue-link js-issue-link" data-error-text="Failed to load issue title" data-id="319108557" data-permission-text="Issue title is private" data-url="https://github.com/bisq-network/bisq-core/issues/106" href="https://github.com/bisq-network/bisq-core/pull/106">bisq-network/bisq-core#106</a></p>

<hr>

<h4>You can view, comment on, or merge this pull request online at:</h4>
<p>  <a href='https://github.com/bisq-network/bisq-desktop/pull/1526'>https://github.com/bisq-network/bisq-desktop/pull/1526</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Merge branch 'master' into mk_master</li>
  <li>Merge branch 'master' into mk_master</li>
  <li>Fix bug with not showing popup when database files got corrupted.</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1526/files#diff-0">src/main/java/bisq/desktop/app/BisqApp.java</a>
    (13)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1526/files#diff-1">src/main/java/bisq/desktop/main/MainView.java</a>
    (22)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1526/files#diff-2">src/main/java/bisq/desktop/main/MainViewModel.java</a>
    (27)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/bisq-network/bisq-desktop/pull/1526.patch'>https://github.com/bisq-network/bisq-desktop/pull/1526.patch</a></li>
  <li><a href='https://github.com/bisq-network/bisq-desktop/pull/1526.diff'>https://github.com/bisq-network/bisq-desktop/pull/1526.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/bisq-network/bisq-desktop/pull/1526">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AkpZths7CAcweKd9p_K_162rAIdeDbvkks5tt94BgaJpZM4TtirN">mute the thread</a>.<img src="https://github.com/notifications/beacon/AkpZtqtTyBMb6CnWkc6KABBftNxjso2Rks5tt94BgaJpZM4TtirN.gif" height="1" width="1" alt="" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/bisq-network/bisq-desktop/pull/1526"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>

<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/bisq-network/bisq-desktop","title":"bisq-network/bisq-desktop","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/bisq-network/bisq-desktop"}},"updates":{"snippets":[{"icon":"DESCRIPTION","message":"Fix startup bug (#1526)"}],"action":{"name":"View Pull Request","url":"https://github.com/bisq-network/bisq-desktop/pull/1526"}}}</script>