Skip to content

Commit

Permalink
Fixed several issues
Browse files Browse the repository at this point in the history
  • Loading branch information
jonbarrow committed Nov 21, 2017
1 parent 73fdb5c commit f3b0f78
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 8 deletions.
10 changes: 7 additions & 3 deletions NodeNUSRipper.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,13 @@ Main.prototype.decrypt = function(location, cb) {
self.emit('rom_decryption_started', location);

fs.copySync(this._config.cdecrypt_location, path.join(location, 'cdecrypt.exe'));
fs.copySync(path.join(this._config.cdecrypt_folder_location, 'libeay32.dll'), path.join(location, 'libeay32.dll'));
fs.copySync(path.join(this._config.cdecrypt_folder_location, 'msvcr120d.dll'), path.join(location, 'msvcr120d.dll'));

if (fs.pathExistsSync(path.join(this._config.cdecrypt_folder_location, 'libeay32.dll'))) {
fs.copySync(path.join(this._config.cdecrypt_folder_location, 'libeay32.dll'), path.join(location, 'libeay32.dll'));
}
if (fs.pathExistsSync(path.join(this._config.cdecrypt_folder_location, 'msvcr120d.dll'))) {
fs.copySync(path.join(this._config.cdecrypt_folder_location, 'msvcr120d.dll'), path.join(location, 'msvcr120d.dll'));
}

console.log('CemUI does not ship with any means to decrypt rom files.\nWhile we would love to do so, we cannot for legal reasons.\nIn order to decrypt the files, CemUI makes use of CDecrypt, which is also not shipped with CemUI due to legal reasons.\nPlease obtain a copy of CDecrypt and tell CemUI where to look for it.');

let decrypter = child_process.spawn('cdecrypt.exe', [
Expand Down
14 changes: 10 additions & 4 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const APP_VERSION = '2.3.2';
const APP_VERSION = '2.3.3';
const CACHE_VERSION = 2;

let electron = require('electron'),
Expand Down Expand Up @@ -1320,7 +1320,13 @@ function getMostPlayed(values) {
function getSuggested(most_played, cb) {
var genres = [];
for (var i=most_played.length-1;i>=0;i--) {
genres.push(most_played[i].genres[Math.floor(Math.random() * most_played[i].genres.length)]);
let game_genres = most_played[i].genres;
if (game_genres.length >= 1) {
genres.push(most_played[i].genres[Math.floor(Math.random() * most_played[i].genres.length)]);
}
}
if (genres.length < 1) {
return cb(null, []);
}
request(API_ROOT + '/api/v2/GetSuggested/' + genres.join('|'), (error, response, body) => {
if (error || response.statusCode !== 200 || !body || body.error) return cb(true);
Expand Down Expand Up @@ -2138,14 +2144,14 @@ function verifyCacheVersion(cb) {
}

function checkSystem(cb) {
if (new RegExp('\\bIntel\\b').test(os.cpus()[0].model)) {
/*if (new RegExp('\\bIntel\\b').test(os.cpus()[0].model)) {
dialog.showMessageBox(ApplicationWindow, {
type: 'warning',
title: 'Warning',
message: 'Unsupported GPU',
detail: 'CemUI has detected an Intel GPU. Cemu does not currently support Intel GPUs. You will experience many bugs and glitches using Cemu'
});
}
}*/
if (os.type() != 'Windows_NT') {
dialog.showMessageBox(ApplicationWindow, {
type: 'warning',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cemui",
"productName": "CemUI",
"version": "2.3.2",
"version": "2.3.3",
"description": "Front end launcher for the WiiU emulator, Cemu",
"author": "RedDucks",
"main": "app.js",
Expand Down

0 comments on commit f3b0f78

Please sign in to comment.